[Emacs-diffs] Changes to emacs/lisp/hi-lock.el

[Chong Yidong]

Index: emacs/lisp/hi-lock.el
diff -c emacs/lisp/hi-lock.el:1.30 emacs/lisp/hi-lock.el:1.31
*** emacs/lisp/hi-lock.el:1.30  Thu Nov 24 20:52:16 2005
--- emacs/lisp/hi-lock.el       Thu Nov 24 21:05:33 2005
***************
*** 297,303 ****
      (when hi-lock-file-patterns
        (font-lock-remove-keywords nil hi-lock-file-patterns)
        (setq hi-lock-file-patterns nil))
!     (if font-lock-mode (hi-lock-refontify))
      (define-key-after menu-bar-edit-menu [hi-lock] nil)
      (remove-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook t)))
  
--- 297,303 ----
      (when hi-lock-file-patterns
        (font-lock-remove-keywords nil hi-lock-file-patterns)
        (setq hi-lock-file-patterns nil))
!     (hi-lock-refontify)
      (define-key-after menu-bar-edit-menu [hi-lock] nil)
      (remove-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook t)))
  
***************
*** 516,523 ****
  (defun hi-lock-refontify ()
    "Unfontify then refontify buffer.  Used when hi-lock patterns change."
    (interactive)
!   (unless font-lock-mode (font-lock-mode 1))
!   (font-lock-fontify-buffer))
  
  (defun hi-lock-find-patterns ()
    "Find patterns in current buffer for hi-lock."
--- 516,523 ----
  (defun hi-lock-refontify ()
    "Unfontify then refontify buffer.  Used when hi-lock patterns change."
    (interactive)
!   (if font-lock-mode
!       (font-lock-fontify-buffer)))
  
  (defun hi-lock-find-patterns ()
    "Find patterns in current buffer for hi-lock."