[Emacs-diffs] Changes to emacs/lisp/font-core.el

[Colin Walters]

Index: emacs/lisp/font-core.el
diff -c emacs/lisp/font-core.el:1.1 emacs/lisp/font-core.el:1.2
*** emacs/lisp/font-core.el:1.1 Tue May 21 16:39:54 2002
--- emacs/lisp/font-core.el     Wed May 22 23:38:22 2002
***************
*** 144,149 ****
--- 144,155 ----
  variable is non-nil, then calling `font-lock-mode' will simply toggle
  the symbol property `face' of CATEGORY-SYMBOL.")
  
+ (defvar font-lock-function 'font-lock-default-function
+   "A function which is called when `font-lock-mode' is toggled.
+ It will be passed one argument, which is the current value of
+ `font-lock-mode'.")
+ (make-variable-buffer-local 'font-lock-default-function)
+ 
  (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
***************
*** 198,210 ****
  
  See the variable `font-lock-defaults-alist' for the Font Lock mode default
  settings.  You can set your own default settings for some mode, by setting a
! buffer local value for `font-lock-defaults', via its mode hook."
    nil nil nil
    ;; Don't turn on Font Lock mode if we don't have a display (we're running a
    ;; batch job) or if the buffer is invisible (the name starts with a space).
    (when (or noninteractive (eq (aref (buffer-name) 0) ?\ ))
      (setq font-lock-mode nil))
  
    ;; Turn on Font Lock mode.
    (when font-lock-mode
      (font-lock-set-defaults)
--- 204,222 ----
  
  See the variable `font-lock-defaults-alist' for the Font Lock mode default
  settings.  You can set your own default settings for some mode, by setting a
! buffer local value for `font-lock-defaults', via its mode hook.
! 
! The above is the default behavior of `font-lock-mode'; you may specify
! your own function which is called when `font-lock-mode' is toggled via
! `font-lock-function'. "
    nil nil nil
    ;; Don't turn on Font Lock mode if we don't have a display (we're running a
    ;; batch job) or if the buffer is invisible (the name starts with a space).
    (when (or noninteractive (eq (aref (buffer-name) 0) ?\ ))
      (setq font-lock-mode nil))
+   (funcall font-lock-function font-lock-mode))
  
+ (defun font-lock-default-function (font-lock-mode)
    ;; Turn on Font Lock mode.
    (when font-lock-mode
      (font-lock-set-defaults)