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

[Lute Kamstra]

Index: emacs/lisp/font-lock.el
diff -c emacs/lisp/font-lock.el:1.243 emacs/lisp/font-lock.el:1.244
*** emacs/lisp/font-lock.el:1.243       Wed Apr 27 19:43:50 2005
--- emacs/lisp/font-lock.el     Thu Apr 28 11:48:53 2005
***************
*** 466,477 ****
  optimized.")
  
  (defvar font-lock-keywords-alist nil
!   "*Alist of `font-lock-keywords' local to a `major-mode'.
  This is normally set via `font-lock-add-keywords' and
  `font-lock-remove-keywords'.")
  
  (defvar font-lock-removed-keywords-alist nil
!   "*Alist of `font-lock-keywords' removed from `major-mode'.
  This is normally set via `font-lock-add-keywords' and
  `font-lock-remove-keywords'.")
  
--- 466,477 ----
  optimized.")
  
  (defvar font-lock-keywords-alist nil
!   "Alist of `font-lock-keywords' local to a `major-mode'.
  This is normally set via `font-lock-add-keywords' and
  `font-lock-remove-keywords'.")
  
  (defvar font-lock-removed-keywords-alist nil
!   "Alist of `font-lock-keywords' removed from `major-mode'.
  This is normally set via `font-lock-add-keywords' and
  `font-lock-remove-keywords'.")
  
***************
*** 664,672 ****
  adds two fontification patterns for C mode, to fontify `FIXME:' words, even in
  comments, and to fontify `and', `or' and `not' words as keywords.
  
! When used from an elisp package (such as a minor mode), it is recommended
! to use nil for MODE (and place the call in a loop or on a hook) to avoid
! subtle problems due to details of the implementation.
  
  Note that some modes have specialized support for additional patterns, e.g.,
  see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
--- 664,672 ----
  adds two fontification patterns for C mode, to fontify `FIXME:' words, even in
  comments, and to fontify `and', `or' and `not' words as keywords.
  
! When used from a Lisp program (such as a minor mode), it is recommended to
! use nil for MODE (and place the call on a hook) to avoid subtle problems
! due to details of the implementation.
  
  Note that some modes have specialized support for additional patterns, e.g.,
  see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
***************
*** 707,715 ****
                    (font-lock-compile-keywords font-lock-keywords t)))))))
  
  (defun font-lock-update-removed-keyword-alist (mode keywords append)
!   ;; Update `font-lock-removed-keywords-alist' when adding new
!   ;; KEYWORDS to MODE.
!   ;;
    ;; When font-lock is enabled first all keywords in the list
    ;; `font-lock-keywords-alist' are added, then all keywords in the
    ;; list `font-lock-removed-keywords-alist' are removed.  If a
--- 707,713 ----
                    (font-lock-compile-keywords font-lock-keywords t)))))))
  
  (defun font-lock-update-removed-keyword-alist (mode keywords append)
!   "Update `font-lock-removed-keywords-alist' when adding new KEYWORDS to 
MODE."
    ;; When font-lock is enabled first all keywords in the list
    ;; `font-lock-keywords-alist' are added, then all keywords in the
    ;; list `font-lock-removed-keywords-alist' are removed.  If a
***************
*** 757,765 ****
  MODE should be a symbol, the major mode command name, such as `c-mode'
  or nil.  If nil, highlighting keywords are removed for the current buffer.
  
! When used from an elisp package (such as a minor mode), it is recommended
! to use nil for MODE (and place the call in a loop or on a hook) to avoid
! subtle problems due to details of the implementation."
    (cond (mode
         ;; Remove one keyword at the time.
         (dolist (keyword keywords)
--- 755,763 ----
  MODE should be a symbol, the major mode command name, such as `c-mode'
  or nil.  If nil, highlighting keywords are removed for the current buffer.
  
! When used from a Lisp program (such as a minor mode), it is recommended to
! use nil for MODE (and place the call on a hook) to avoid subtle problems
! due to details of the implementation."
    (cond (mode
         ;; Remove one keyword at the time.
         (dolist (keyword keywords)