[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/font-core.el
From: |
Colin Walters |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/font-core.el |
Date: |
Sat, 08 Jun 2002 20:41:11 -0400 |
Index: emacs/lisp/font-core.el
diff -c emacs/lisp/font-core.el:1.5 emacs/lisp/font-core.el:1.6
*** emacs/lisp/font-core.el:1.5 Sat Jun 8 20:19:23 2002
--- emacs/lisp/font-core.el Sat Jun 8 20:41:11 2002
***************
*** 225,231 ****
(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.
--- 225,232 ----
(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 (and font-lock-defaults
! (not font-lock-core-only))
(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.
***************
*** 247,253 ****
(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))))
--- 248,255 ----
(setcdr elt (remq 'font-lock-face (cdr elt)))
(when (null (cdr elt))
(setq char-property-alias-alist (delq elt
char-property-alias-alist)))))
! (when (and font-lock-defaults
! (not font-lock-core-only))
(remove-hook 'after-change-functions 'font-lock-after-change-function t)
(font-lock-unfontify-buffer)
(font-lock-turn-off-thing-lock))))
***************
*** 269,279 ****
(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)))))
--- 271,283 ----
(make-local-variable 'font-lock-multiline)
(let ((defaults (or font-lock-defaults
(assq major-mode font-lock-defaults-alist))))
+ ;; Variable alist?
+ (dolist (x (nthcdr 5 defaults))
+ (set (make-local-variable (car x)) (cdr x)))
(when (and defaults
;; Detect if this is a simple mode, which doesn't use
;; any syntactic fontification functions.
! (not font-lock-core-only))
(require 'font-lock)
(font-lock-set-defaults-1)))))