From 558ca3c1225f6035442733d5d3fb5fd4c40a0a45 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 12 Feb 2008 16:49:21 +0000 Subject: [PATCH] (font-lock-set-defaults): Unset previously set variables when needed. --- lisp/ChangeLog | 5 +++++ lisp/font-lock.el | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b368112454..49706f3c0aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-02-12 Stefan Monnier + + * font-lock.el (font-lock-set-defaults): Unset previously set variables + when needed. + 2008-02-12 Juanma Barranquero * uniquify.el (uniquify-buffer-base-name): New function. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 8fcd85515a4..0408d12b5d1 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1777,13 +1777,16 @@ Sets various variables using `font-lock-defaults' (or, if nil, using (cdr-safe (assq major-mode font-lock-removed-keywords-alist)))) (set (make-local-variable 'font-lock-defaults) defaults) ;; Syntactic fontification? - (when (nth 1 defaults) - (set (make-local-variable 'font-lock-keywords-only) t)) + (if (nth 1 defaults) + (set (make-local-variable 'font-lock-keywords-only) t) + (kill-local-variable 'font-lock-keywords-only)) ;; Case fold during regexp fontification? - (when (nth 2 defaults) - (set (make-local-variable 'font-lock-keywords-case-fold-search) t)) + (if (nth 2 defaults) + (set (make-local-variable 'font-lock-keywords-case-fold-search) t) + (kill-local-variable 'font-lock-keywords-case-fold-search)) ;; Syntax table for regexp and syntactic fontification? - (when (nth 3 defaults) + (if (null (nth 3 defaults)) + (kill-local-variable 'font-lock-syntax-table) (set (make-local-variable 'font-lock-syntax-table) (copy-syntax-table (syntax-table))) (dolist (selem (nth 3 defaults)) @@ -1794,9 +1797,10 @@ Sets various variables using `font-lock-defaults' (or, if nil, using (mapcar 'identity (car selem)))) (modify-syntax-entry char syntax font-lock-syntax-table))))) ;; Syntax function for syntactic fontification? - (when (nth 4 defaults) + (if (nth 4 defaults) (set (make-local-variable 'font-lock-beginning-of-syntax-function) - (nth 4 defaults))) + (nth 4 defaults)) + (kill-local-variable 'font-lock-beginning-of-syntax-function)) ;; Variable alist? (dolist (x (nthcdr 5 defaults)) (set (make-local-variable (car x)) (cdr x))) -- 2.11.4.GIT