summaryrefslogtreecommitdiff
path: root/lisp/font-lock.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-05-18 23:38:24 +0000
committerRichard M. Stallman <rms@gnu.org>1994-05-18 23:38:24 +0000
commit7956dc63d47375705a2b1b8e2a71dbc48232a2d5 (patch)
tree9989691960665a0da923d291da1e983783f581fa /lisp/font-lock.el
parent7ed5dd0ed6bb2e0731bfc073877268a5d40eeff0 (diff)
downloademacs-7956dc63d47375705a2b1b8e2a71dbc48232a2d5.tar.gz
(font-lock-after-change-function): Fix typo in prev chg.
(font-lock-mode): Use after-change-functions not after-change-function.
Diffstat (limited to 'lisp/font-lock.el')
-rw-r--r--lisp/font-lock.el15
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 4c0d4c0c379..da7373db79f 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -265,7 +265,7 @@ slow things down!")
;; Must scan from line start in case of
;; inserting space into `intfoo () {}'.
(if font-lock-no-comments
- (remove-text-properties beg (1+ end) '(face nil))
+ (remove-text-properties beg (min (1+ end) (point-max)) '(face nil))
(font-lock-fontify-region beg (min (1+ end) (point-max))))
;; Now scan for keywords.
(font-lock-hack-keywords beg end))))
@@ -365,11 +365,14 @@ can use \\[font-lock-fontify-buffer]."
(> (prefix-numeric-value arg) 0))))
(if (equal (buffer-name) " *Compiler Input*") ; hack for bytecomp...
(setq on-p nil))
- (or (memq after-change-function
- '(nil font-lock-after-change-function))
- (error "after-change-function is %s" after-change-function))
- (set (make-local-variable 'after-change-function)
- (if on-p 'font-lock-after-change-function nil))
+ (make-local-variable 'after-change-functions)
+ (if on-p
+ (or (memq 'font-lock-after-change-function after-change-functions)
+ (setq after-change-functions (cons 'font-lock-after-change-function
+ after-change-functions)))
+ (setq after-change-functions
+ (delq 'font-lock-after-change-function
+ (copy-sequence after-change-functions))))
(set (make-local-variable 'font-lock-mode) on-p)
(make-local-variable 'font-lock-no-comments)
(cond (on-p