Commit e4d59066 authored by Chong Yidong's avatar Chong Yidong
Browse files

* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.

	(hi-lock-unface-buffer, hi-lock-set-file-patterns): Call
	font-lock-fontify-buffer.
	(hi-lock-refontify): Deleted.
	(hi-lock-font-lock-hook): Turn off hi-lock when font lock is
	turned off.
parent 9cb4bb45
2005-11-24 Chong Yidong <cyd@stupidchicken.com>
 
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Use define-minor-mode, and make it a local mode.
Use define-minor-mode, and make it a local mode. Turn on
font-lock.
(hi-lock-mode): New global minor mode.
(turn-on-hi-lock-if-enabled): New function.
(hi-lock-line-face-buffer, hi-lock-face-buffer)
......@@ -13,8 +14,14 @@
 
(hi-lock-face-phrase-buffer): Call hi-lock-buffer-mode. Use new
arguments for hi-lock-set-pattern.
(hi-lock-unface-buffer, hi-lock-set-file-patterns): Call
font-lock-fontify-buffer.
(hi-lock-find-file-hook, hi-lock-current-line)
(hi-lock-set-patterns): Deleted unused functions.
(hi-lock-refontify, hi-lock-set-patterns): Deleted unused
functions.
(hi-lock-font-lock-hook): Turn off hi-lock when font lock is
turned off.
 
* progmodes/compile.el (compilation-setup): Don't fiddle with
font-lock-defaults.
......
......@@ -286,18 +286,22 @@ is found. A mode is excluded if it's in the list `hi-lock-exclude-modes'."
(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 t))
(add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil 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)
(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,7 +430,7 @@ interactive functions. \(See `hi-lock-interactive-patterns'.\)
(font-lock-remove-keywords nil (list keyword))
(setq hi-lock-interactive-patterns
(delq keyword hi-lock-interactive-patterns))
(hi-lock-refontify))))
(font-lock-fontify-buffer))))
;;;###autoload
(defun hi-lock-write-interactive-patterns ()
......@@ -511,13 +515,7 @@ not suitable."
(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)))
(font-lock-fontify-buffer)))
(defun hi-lock-find-patterns ()
"Find patterns in current buffer for hi-lock."
......@@ -544,9 +542,10 @@ not suitable."
(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)))
(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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment