From: Simon Marshall <simon@gnu.org>
Date: Wed, 12 Oct 1994 16:03:28 +0000 (+0000)
Subject: Removed setting of font-lock-keywords inadvertently left after last patch.
X-Git-Tag: emacs-19.34~6365
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4ca8d660fcd3e2472e6fde9009d6ea723129fac;p=emacs.git

Removed setting of font-lock-keywords inadvertently left after last patch.
---

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 260c31186e2..c04a31607da 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -827,11 +827,11 @@ Calls the value of `sh-set-shell-hook' if set."
 	  sh-shell (intern (file-name-nondirectory sh-shell-path))
 	  sh-shell-is-csh (memq sh-shell '(csh tcsh))
 	  font-lock-defaults
-	  (list (intern-soft (format "sh-%s-font-lock-keywords" sh-shell))) 
-	  font-lock-keywords (if (and font-lock-keywords
-				      (boundp font-lock-keywords))
-				 (symbol-value font-lock-keywords)
-			       sh-font-lock-keywords)
+	  (let ((keywords (intern-soft (format "sh-%s-font-lock-keywords"
+					       sh-shell))))
+	    (list (if (and keywords (boundp keywords))
+		      keywords
+		    'sh-font-lock-keywords)))
 	  comment-start-skip (if sh-shell-is-csh
 				 "\\(^\\|[^$]\\|\\$[^{]\\)#+[\t ]*"
 			       "\\(^\\|[^$]\\|\\$[^{]\\)\\B#+[\t ]*")