# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1240450494 0
# Node ID b6361d016a5ac5b30e223e4356fe0cc22129ae98
# Parent  3aba158ceebea4a92aeac008da822a8d7f382794
* hi-lock.el (hi-lock--inhibit-font-lock-hook): New var.
(hi-lock-set-pattern, hi-lock-font-lock-hook): Use it (Bug#3068).

diff -r 3aba158ceebe -r b6361d016a5a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 23 01:34:15 2009 +0000
+++ b/lisp/ChangeLog	Thu Apr 23 01:34:54 2009 +0000
@@ -1,3 +1,8 @@
+2009-04-23  Chong Yidong  <cyd@stupidchicken.com>
+
+	* hi-lock.el (hi-lock--inhibit-font-lock-hook): New var.
+	(hi-lock-set-pattern, hi-lock-font-lock-hook): Use it (Bug#3068).
+
 2009-04-21  Martin Rudalics  <rudalics@gmx.at>
 
 	* diff-mode.el (diff-find-source-location): Don't call
diff -r 3aba158ceebe -r b6361d016a5a lisp/hi-lock.el
--- a/lisp/hi-lock.el	Thu Apr 23 01:34:15 2009 +0000
+++ b/lisp/hi-lock.el	Thu Apr 23 01:34:54 2009 +0000
@@ -564,9 +564,18 @@
            'face-name-history
 	   (cdr hi-lock-face-defaults))))
 
+(defvar hi-lock--inhibit-font-lock-hook nil
+  "Inhibit the action of `hi-lock-font-lock-hook'.
+This is used by `hi-lock-set-pattern'.")
+
 (defun hi-lock-set-pattern (regexp face)
   "Highlight REGEXP with face FACE."
-  (let ((pattern (list regexp (list 0 (list 'quote face) t))))
+  (let ((pattern (list regexp (list 0 (list 'quote face) t)))
+	;; The call to `font-lock-add-keywords' below might disable
+	;; and re-enable font-lock mode.  If so, we don't want
+	;; `hi-lock-font-lock-hook' to run.  This can be removed once
+	;; Bug#635 is fixed. -- cyd
+	(hi-lock--inhibit-font-lock-hook t))
     (unless (member pattern hi-lock-interactive-patterns)
       (font-lock-add-keywords nil (list pattern) t)
       (push pattern hi-lock-interactive-patterns)
@@ -632,11 +641,12 @@
 
 (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 t)
-	(font-lock-add-keywords nil hi-lock-interactive-patterns t))
-    (hi-lock-mode -1)))
+  (unless hi-lock--inhibit-font-lock-hook
+    (if font-lock-mode
+	(progn
+	  (font-lock-add-keywords nil hi-lock-file-patterns t)
+	  (font-lock-add-keywords nil hi-lock-interactive-patterns t))
+      (hi-lock-mode -1))))
 
 (defvar hi-lock-string-serialize-hash
   (make-hash-table :test 'equal)
diff -r 3aba158ceebe -r b6361d016a5a lisp/startup.el
--- a/lisp/startup.el	Thu Apr 23 01:34:15 2009 +0000
+++ b/lisp/startup.el	Thu Apr 23 01:34:54 2009 +0000
@@ -499,7 +499,8 @@
 		     (delete (concat "PWD=" pwd)
 			     process-environment)))))
     (setq default-directory (abbreviate-file-name default-directory))
-    (let ((menubar-bindings-done nil))
+    (let ((menubar-bindings-done nil)
+	  (old-face-font-rescale-alist face-font-rescale-alist))
       (unwind-protect
 	  (command-line)
 	;; Do this again, in case .emacs defined more abbreviations.
@@ -540,6 +541,11 @@
 		  (not (and initial-window-system
 			    (not noninteractive)
 			    (not (eq initial-window-system 'pc)))))
+	  ;; If face-font-rescale-alist has changed, reload the
+	  ;; default font.
+	  (unless (eq face-font-rescale-alist
+		      old-face-font-rescale-alist)
+	    (set-face-attribute 'default nil :font (font-spec)))
 	  ;; Modify the initial frame based on what .emacs puts into
 	  ;; ...-frame-alist.
 	  (if (fboundp 'frame-notice-user-settings)