[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.32 emacs/lisp/hi-lock.el:1.33
*** emacs/lisp/hi-lock.el:1.32  Thu Nov 24 21:11:42 2005
--- emacs/lisp/hi-lock.el       Fri Nov 25 05:32:56 2005
***************
*** 286,303 ****
    (if hi-lock-buffer-mode
        ;; Turned on.
        (progn
        (define-key-after menu-bar-edit-menu [hi-lock]
          (cons "Regexp Highlighting" hi-lock-menu))
        (hi-lock-find-patterns)
!       (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook t))
      ;; Turned off.
!     (when hi-lock-interactive-patterns 
!       (font-lock-remove-keywords nil hi-lock-interactive-patterns)
!       (setq hi-lock-interactive-patterns nil))
!     (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)))
  
--- 286,307 ----
    (if hi-lock-buffer-mode
        ;; Turned on.
        (progn
+       (unless font-lock-mode (font-lock-mode 1))
        (define-key-after menu-bar-edit-menu [hi-lock]
          (cons "Regexp Highlighting" hi-lock-menu))
        (hi-lock-find-patterns)
!       (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t))
      ;; Turned off.
!     (when (or hi-lock-interactive-patterns
!             hi-lock-file-patterns)
!       (when hi-lock-interactive-patterns 
!       (font-lock-remove-keywords nil hi-lock-interactive-patterns)
!       (setq hi-lock-interactive-patterns nil))
!       (when hi-lock-file-patterns
!       (font-lock-remove-keywords nil hi-lock-file-patterns)
!       (setq hi-lock-file-patterns nil))
!       (if font-lock-mode
!         (font-lock-fontify-buffer)))
      (define-key-after menu-bar-edit-menu [hi-lock] nil)
      (remove-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook t)))
  
***************
*** 426,432 ****
        (font-lock-remove-keywords nil (list keyword))
        (setq hi-lock-interactive-patterns
              (delq keyword hi-lock-interactive-patterns))
!       (hi-lock-refontify))))
  
  ;;;###autoload
  (defun hi-lock-write-interactive-patterns ()
--- 430,436 ----
        (font-lock-remove-keywords nil (list keyword))
        (setq hi-lock-interactive-patterns
              (delq keyword hi-lock-interactive-patterns))
!       (font-lock-fontify-buffer))))
  
  ;;;###autoload
  (defun hi-lock-write-interactive-patterns ()
***************
*** 511,523 ****
      (font-lock-remove-keywords nil hi-lock-file-patterns)
      (setq hi-lock-file-patterns patterns)
      (font-lock-add-keywords nil hi-lock-file-patterns)
!     (hi-lock-refontify)))
! 
! (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."
--- 515,521 ----
      (font-lock-remove-keywords nil hi-lock-file-patterns)
      (setq hi-lock-file-patterns patterns)
      (font-lock-add-keywords nil hi-lock-file-patterns)
!     (font-lock-fontify-buffer)))
  
  (defun hi-lock-find-patterns ()
    "Find patterns in current buffer for hi-lock."
***************
*** 544,552 ****
  
  (defun hi-lock-font-lock-hook ()
    "Add hi lock patterns to font-lock's."
!   (when font-lock-mode
!     (font-lock-add-keywords nil hi-lock-file-patterns)
!     (font-lock-add-keywords nil hi-lock-interactive-patterns)))
  
  (provide 'hi-lock)
  
--- 542,551 ----
  
  (defun hi-lock-font-lock-hook ()
    "Add hi lock patterns to font-lock's."
!   (if font-lock-mode
!       (progn (font-lock-add-keywords nil hi-lock-file-patterns)
!            (font-lock-add-keywords nil hi-lock-interactive-patterns))
!     (hi-lock-buffer-mode -1)))
  
  (provide 'hi-lock)