*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3eae79d4a9112c215b85a1ebc469674033a29509..b071b1698860e77b7b03a5f2cd5456b191b71100 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 1999-12-16  Gerd Moellmann  <gerd@gnu.org>
 
+       * progmodes/sh-script.el (sh-mode): If there is no #!-line, use
+       the shell from sh-shell-file.
+
        * font-lock.el (java-keywords): Add Javadoc tags as of JDK 1.2.1.
 
 1999-12-16  Eli Zaretskii  <eliz@is.elta.co.il>

diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index f6b26d92e3fc8b425e840ba4dd7cd1097daa3fbe..021912e4787682bef4909f39032ca2a9e0bdbc96 100644 (file)
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -19528,7 +19528,7 @@
 
        * mspools.el: New file.
 
-       * sh-script.el (sh-set-shell): If file has no #! line,
+       * sh-script.el (sh-mode): If file has no #! line,
        set the syntax table based on the default shell.
 
 1997-03-29  Barry A. Warsaw  <cc-mode-help@python.org>