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

[Miles Bader]

Index: emacs/lisp/font-core.el
diff -c emacs/lisp/font-core.el:1.7.2.1 emacs/lisp/font-core.el:1.7.2.2
*** emacs/lisp/font-core.el:1.7.2.1     Fri Apr  4 01:20:05 2003
--- emacs/lisp/font-core.el     Tue Oct 14 19:51:04 2003
***************
*** 1,6 ****
  ;;; font-core.el --- Core interface to font-lock
  
! ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 2002
  ;;  Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; font-core.el --- Core interface to font-lock
  
! ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 02, 2003
  ;;  Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
***************
*** 25,33 ****
  
  ;;; Code:
  
- (defvar font-lock-maximum-size)
- (defvar font-lock-verbose)
- 
  ;; This variable is used by mode packages that support Font Lock mode by
  ;; defining their own keywords to use for `font-lock-keywords'.  (The mode
  ;; command should make it buffer-local and set it to provide the set up.)
--- 25,30 ----
***************
*** 76,127 ****
  `font-lock-inhibit-thing-lock' and `font-lock-maximum-size'.")
  (make-variable-buffer-local 'font-lock-defaults)
  
! ;; This variable is used where font-lock.el itself supplies the
! ;; keywords.  Really, this shouldn't need to be in font-core.el, but
! ;; we can't avoid it.  In the future, this stuff will hopefully be
! ;; moved to cc-mode itself.
! (defvar font-lock-defaults-alist
!   (let (;; We use `beginning-of-defun', rather than nil, for SYNTAX-BEGIN.
!       ;; Thus the calculation of the cache is usually faster but not
!       ;; infallible, so we risk mis-fontification.  sm.
!       (c-mode-defaults
!        '((c-font-lock-keywords c-font-lock-keywords-1
!           c-font-lock-keywords-2 c-font-lock-keywords-3)
!          nil nil ((?_ . "w")) beginning-of-defun
!          (font-lock-syntactic-face-function
!           . c-font-lock-syntactic-face-function)
!          (font-lock-mark-block-function . mark-defun)))
!       (c++-mode-defaults
!        '((c++-font-lock-keywords c++-font-lock-keywords-1
!           c++-font-lock-keywords-2 c++-font-lock-keywords-3)
!          nil nil ((?_ . "w")) beginning-of-defun
!          (font-lock-syntactic-face-function
!           . c-font-lock-syntactic-face-function)
!          (font-lock-mark-block-function . mark-defun)))
!       (objc-mode-defaults
!        '((objc-font-lock-keywords objc-font-lock-keywords-1
!           objc-font-lock-keywords-2 objc-font-lock-keywords-3)
!          nil nil ((?_ . "w") (?$ . "w")) nil
!          (font-lock-syntactic-face-function
!           . c-font-lock-syntactic-face-function)
!          (font-lock-mark-block-function . mark-defun)))
!       (java-mode-defaults
!        '((java-font-lock-keywords java-font-lock-keywords-1
!           java-font-lock-keywords-2 java-font-lock-keywords-3)
!          nil nil ((?_ . "w") (?$ . "w")) nil
!          (font-lock-syntactic-face-function
!           . java-font-lock-syntactic-face-function)
!          (font-lock-mark-block-function . mark-defun))))
!     (list
!      (cons 'c-mode                    c-mode-defaults)
!      (cons 'c++-mode                  c++-mode-defaults)
!      (cons 'objc-mode                 objc-mode-defaults)
!      (cons 'java-mode                 java-mode-defaults)))
    "Alist of fall-back Font Lock defaults for major modes.
  
- This variable should not be used any more.
- Set the buffer-local `font-lock-keywords' in the major mode instead.
- 
  Each item should be a list of the form:
  
   (MAJOR-MODE . FONT-LOCK-DEFAULTS)
--- 73,81 ----
  `font-lock-inhibit-thing-lock' and `font-lock-maximum-size'.")
  (make-variable-buffer-local 'font-lock-defaults)
  
! (defvar font-lock-defaults-alist nil
    "Alist of fall-back Font Lock defaults for major modes.
  
  Each item should be a list of the form:
  
   (MAJOR-MODE . FONT-LOCK-DEFAULTS)
***************
*** 130,149 ****
  settings.  See the variable `font-lock-defaults', which takes precedence.")
  (make-obsolete-variable 'font-lock-defaults-alist 'font-lock-defaults)
  
- (defvar font-lock-multiline nil
-   "Whether font-lock should cater to multiline keywords.
- If nil, don't try to handle multiline patterns.
- If t, always handle multiline patterns.
- If `undecided', don't try to handle multiline patterns until you see one.
- Major/minor modes can set this variable if they know which option applies.")
- 
- (defvar font-lock-fontified nil)      ; Whether we have fontified the buffer.
- 
  (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-function)
  
  (define-minor-mode font-lock-mode
    "Toggle Font Lock mode.
--- 84,93 ----
***************
*** 222,228 ****
  
  (defun font-lock-defontify ()
    "Clear out all `font-lock-face' properties in current buffer.
! A major mode that uses `font-lock-face' properties should put
  this function onto `change-major-mode-hook'."
    (let ((modp (buffer-modified-p))
        (inhibit-read-only t))
--- 166,172 ----
  
  (defun font-lock-defontify ()
    "Clear out all `font-lock-face' properties in current buffer.
! A major mode that uses `font-lock-face' properties might want to put
  this function onto `change-major-mode-hook'."
    (let ((modp (buffer-modified-p))
        (inhibit-read-only t))
***************
*** 235,241 ****
  (defun font-lock-default-function (mode)
    ;; Turn on Font Lock mode.
    (when mode
-     (font-lock-set-defaults)
      (set (make-local-variable 'char-property-alias-alist)
         (copy-tree char-property-alias-alist))
      ;; Add `font-lock-face' as an alias for the `face' property.
--- 179,184 ----
***************
*** 243,263 ****
        (if elt
          (unless (memq 'font-lock-face (cdr elt))
            (setcdr elt (nconc (cdr elt) (list 'font-lock-face))))
!       (push (list 'face 'font-lock-face) char-property-alias-alist)))
!     ;; Only do hard work if the mode has specified stuff in
!     ;; `font-lock-defaults'.
!     (when font-lock-defaults
!       (add-hook 'after-change-functions 'font-lock-after-change-function t t)
!       (font-lock-turn-on-thing-lock)
!       ;; Fontify the buffer if we have to.
!       (let ((max-size (font-lock-value-in-major-mode font-lock-maximum-size)))
!       (cond (font-lock-fontified
!              nil)
!             ((or (null max-size) (> max-size (buffer-size)))
!              (font-lock-fontify-buffer))
!             (font-lock-verbose
!              (message "Fontifying %s...buffer size greater than 
font-lock-maximum-size"
!                       (buffer-name)))))))
    ;; Turn off Font Lock mode.
    (unless mode
      ;; Remove `font-lock-face' as an alias for the `face' property.
--- 186,192 ----
        (if elt
          (unless (memq 'font-lock-face (cdr elt))
            (setcdr elt (nconc (cdr elt) (list 'font-lock-face))))
!       (push (list 'face 'font-lock-face) char-property-alias-alist))))
    ;; Turn off Font Lock mode.
    (unless mode
      ;; Remove `font-lock-face' as an alias for the `face' property.
***************
*** 267,299 ****
        (when elt
        (setcdr elt (remq 'font-lock-face (cdr elt)))
        (when (null (cdr elt))
!         (setq char-property-alias-alist (delq elt 
char-property-alias-alist)))))
!     (when font-lock-defaults
!       (remove-hook 'after-change-functions 'font-lock-after-change-function t)
!       (font-lock-unfontify-buffer)
!       (font-lock-turn-off-thing-lock))))
  
  (defun turn-on-font-lock ()
    "Turn on Font Lock mode (only if the terminal can display it)."
    (unless font-lock-mode
      (font-lock-mode)))
  
- (defvar font-lock-set-defaults nil)   ; Whether we have set up defaults.
- 
- (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'."
-   (unless font-lock-set-defaults
-     (set (make-local-variable 'font-lock-set-defaults) t)
-     (make-local-variable 'font-lock-fontified)
-     (make-local-variable 'font-lock-multiline)
-     (let ((defaults (or font-lock-defaults
-                       (cdr (assq major-mode font-lock-defaults-alist)))))
-       (when defaults
-       (require 'font-lock)
-       (font-lock-set-defaults-1)))))
- 
  ;;; Global Font Lock mode.
  
  ;; A few people have hassled in the past for a way to make it easier to turn 
on
--- 196,215 ----
        (when elt
        (setcdr elt (remq 'font-lock-face (cdr elt)))
        (when (null (cdr elt))
!         (setq char-property-alias-alist
!               (delq elt char-property-alias-alist))))))
! 
!   ;; Only do hard work if the mode has specified stuff in
!   ;; `font-lock-defaults'.
!   (when (or font-lock-defaults
!           (cdr (assq major-mode font-lock-defaults-alist)))
!     (font-lock-mode-internal mode)))
  
  (defun turn-on-font-lock ()
    "Turn on Font Lock mode (only if the terminal can display it)."
    (unless font-lock-mode
      (font-lock-mode)))
  
  ;;; Global Font Lock mode.
  
  ;; A few people have hassled in the past for a way to make it easier to turn 
on
***************
*** 381,383 ****
--- 297,300 ----
  
  ;;; font-core.el ends here
  
+ ;;; arch-tag: f8c286e1-02f7-41d9-b89b-1b67780aed71