[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99860: * lisp/font-lock.el (font-lock-major-mode): Rename from

[Stefan Monnier]

------------------------------------------------------------
revno: 99860
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-06-16 16:00:22 -0400
message:
  * lisp/font-lock.el (font-lock-major-mode): Rename from
  font-lock-mode-major-mode to distinguish it from
  global-font-lock-mode's own font-lock-mode-major-mode.
  (font-lock-set-defaults):
  * lisp/font-core.el (font-lock-default-function): Adjust users.
  (font-lock-mode): Don't set it at all.
modified:
  lisp/ChangeLog
  lisp/font-core.el
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-15 04:51:42 +0000
+++ b/lisp/ChangeLog    2010-06-16 20:00:22 +0000
@@ -1,3 +1,12 @@
+2010-06-16  Stefan Monnier  <address@hidden>
+
+       * font-lock.el (font-lock-major-mode): Rename from
+       font-lock-mode-major-mode to distinguish it from
+       global-font-lock-mode's own font-lock-mode-major-mode (bug#6135).
+       (font-lock-set-defaults):
+       * font-core.el (font-lock-default-function): Adjust users.
+       (font-lock-mode): Don't set it at all.
+
 2010-06-15  Stefan Monnier  <address@hidden>
 
        * vc-annotate.el (vc-annotate): Use vc-read-revision.

=== modified file 'lisp/font-core.el'
--- a/lisp/font-core.el 2010-01-13 08:35:10 +0000
+++ b/lisp/font-core.el 2010-06-16 20:00:22 +0000
@@ -97,7 +97,7 @@
 `font-lock-mode'.")
 
 ;; The mode for which font-lock was initialized, or nil if none.
-(defvar font-lock-mode-major-mode)
+(defvar font-lock-major-mode)
 (define-minor-mode font-lock-mode
   "Toggle Font Lock mode.
 With arg, turn Font Lock mode off if and only if arg is a non-positive
@@ -159,9 +159,7 @@
   ;; Arrange to unfontify this buffer if we change major mode later.
   (if font-lock-mode
       (add-hook 'change-major-mode-hook 'font-lock-change-mode nil t)
-    (remove-hook 'change-major-mode-hook 'font-lock-change-mode t))
-  (when font-lock-mode
-    (setq font-lock-mode-major-mode major-mode)))
+    (remove-hook 'change-major-mode-hook 'font-lock-change-mode t)))
 
 ;; Get rid of fontification for the old major mode.
 ;; We do this when changing major modes.
@@ -213,8 +211,8 @@
            (and mode
                 (boundp 'font-lock-set-defaults)
                 font-lock-set-defaults
-                font-lock-mode-major-mode
-                (not (eq font-lock-mode-major-mode major-mode))))
+                font-lock-major-mode
+                (not (eq font-lock-major-mode major-mode))))
     (font-lock-mode-internal mode)))
 
 (defun turn-on-font-lock ()

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2010-01-13 08:35:10 +0000
+++ b/lisp/font-lock.el 2010-06-16 20:00:22 +0000
@@ -1784,15 +1784,18 @@
   (kill-local-variable 'font-lock-set-defaults)
   (font-lock-mode 1))
 
-(defvar font-lock-mode-major-mode)
+(defvar font-lock-major-mode nil
+  "Major mode for which the font-lock settings have been setup.")
+(make-variable-buffer-local 'font-lock-major-mode)
+
 (defun font-lock-set-defaults ()
   "Set fontification defaults appropriately for this mode.
 Sets various variables using `font-lock-defaults' (or, if nil, using
 `font-lock-defaults-alist') and `font-lock-maximum-decoration'."
   ;; Set fontification defaults if not previously set for correct major mode.
   (unless (and font-lock-set-defaults
-              (eq font-lock-mode-major-mode major-mode))
-    (setq font-lock-mode-major-mode major-mode)
+              (eq font-lock-major-mode major-mode))
+    (setq font-lock-major-mode major-mode)
     (set (make-local-variable 'font-lock-set-defaults) t)
     (make-local-variable 'font-lock-fontified)
     (make-local-variable 'font-lock-multiline)