[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.4 emacs/lisp/font-core.el:1.5
*** emacs/lisp/font-core.el:1.4 Sat Jun  8 16:39:29 2002
--- emacs/lisp/font-core.el     Sat Jun  8 20:19:23 2002
***************
*** 73,78 ****
--- 73,81 ----
  `font-lock-inhibit-thing-lock' and `font-lock-maximum-size'.")
  (make-variable-buffer-local 'font-lock-defaults)
  
+ (defvar font-lock-core-only nil
+   "If non-nil, then don't load font-lock.el unless necessary.")
+ 
  ;; 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
***************
*** 264,275 ****
      (set (make-local-variable 'font-lock-set-defaults) t)
      (make-local-variable 'font-lock-fontified)
      (make-local-variable 'font-lock-multiline)
!     ;; Detect if this is a simple mode, which doesn't use any
!     ;; syntactic fontification functions.
!     (when (or font-lock-defaults
!             (assq major-mode font-lock-defaults-alist))
!       (require 'font-lock)
!       (font-lock-set-defaults-1))))
  
  ;;; Global Font Lock mode.
  
--- 267,281 ----
      (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
!                       (assq major-mode font-lock-defaults-alist))))
!       (when (and defaults
!                ;; Detect if this is a simple mode, which doesn't use
!                ;; any syntactic fontification functions.
!                (not (cdr (assq 'font-lock-core-only
!                                (nthcdr 5 defaults)))))
!       (require 'font-lock)
!       (font-lock-set-defaults-1)))))
  
  ;;; Global Font Lock mode.