# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1064454985 0
# Node ID 042703b81a5043bdae426a928868ab5d96859f94
# Parent  f8adaf14f57011930754c341131d6cddefaf2b24
*** empty log message ***

diff -r f8adaf14f570 -r 042703b81a50 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Sep 24 23:52:45 2003 +0000
+++ b/lisp/ChangeLog	Thu Sep 25 01:56:25 2003 +0000
@@ -1,3 +1,9 @@
+2003-09-25  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+	* progmodes/sh-script.el (sh-builtins): Add bash `shopt' builtin.
+	(sh-font-lock-keywords, sh-feature): Fix previous change of
+	sh-feature to avoid infloop with sh-font-lock-keywords.
+
 2003-09-25  Kim F. Storm  <storm@cua.dk>
 
 	* frame.el (frame-current-scroll-bars): New defun.