From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 24 Nov 2005 21:05:33 +0000 (+0000)
Subject: Fix two omissions in last change.
X-Git-Tag: emacs-pretest-22.0.90~5687
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae34cba19b587572dcdf7f3a42f6f2666216c5d9;p=emacs.git

Fix two omissions in last change.
---

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index ceb8900f941..c477b6d85a2 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -297,7 +297,7 @@ is found. A mode is excluded if it's in the list `hi-lock-exclude-modes'."
     (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))
+    (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,8 +516,8 @@ not suitable."
 (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))
+  (if font-lock-mode
+      (font-lock-fontify-buffer)))
 
 (defun hi-lock-find-patterns ()
   "Find patterns in current buffer for hi-lock."