From: Glenn Morris <rgm@gnu.org>
Date: Thu, 25 Sep 2003 01:56:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~8738
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd130f1d5e86a8f4412f430aef246a458289bec7;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c497811baa3..db562e565ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.