From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 23 Dec 1993 04:36:41 +0000 (+0000)
Subject: (font-lock-set-defaults): Do nothing if font-lock-keywords is already set.
X-Git-Tag: emacs-19.34~10557
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a47d9087bc2322861944893825165c6e2b7c2c3d;p=emacs.git

(font-lock-set-defaults): Do nothing if font-lock-keywords is already set.
---

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 5081874ca90..9af71b86d89 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -409,16 +409,17 @@ This can take a while for large buffers."
 
 (defun font-lock-set-defaults ()
   "Set `font-lock-keywords' to something appropriate for this mode."
-  (setq font-lock-keywords
-	(cond ((eq major-mode 'lisp-mode)	lisp-font-lock-keywords)
-	      ((eq major-mode 'emacs-lisp-mode)	lisp-font-lock-keywords)
-	      ((eq major-mode 'c-mode)		c-font-lock-keywords)
-	      ((eq major-mode 'c++-c-mode)	c-font-lock-keywords)
-	      ((eq major-mode 'c++-mode)	c++-font-lock-keywords)
-	      ((eq major-mode 'perl-mode)	perl-font-lock-keywords)
-	      ((eq major-mode 'tex-mode)	tex-font-lock-keywords)
-	      ((eq major-mode 'texinfo-mode)	texi-font-lock-keywords)
-	      (t nil))))
+  (if (not font-lock-keywords)		; if not already set.
+      (setq font-lock-keywords
+	    (cond ((eq major-mode 'lisp-mode)	    lisp-font-lock-keywords)
+		  ((eq major-mode 'emacs-lisp-mode) lisp-font-lock-keywords)
+		  ((eq major-mode 'c-mode)	    c-font-lock-keywords)
+		  ((eq major-mode 'c++-c-mode)	    c-font-lock-keywords)
+		  ((eq major-mode 'c++-mode)	    c++-font-lock-keywords)
+		  ((eq major-mode 'perl-mode) 	    perl-font-lock-keywords)
+		  ((eq major-mode 'tex-mode)        tex-font-lock-keywords)
+		  ((eq major-mode 'texinfo-mode)    texi-font-lock-keywords)
+		  (t nil))))
 
 (defconst lisp-font-lock-keywords-1
  '(;;