*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef16c694cd1cc9e5bd4aa96b85a7352a81504816..63f49aff2e627fa9f1fced8c53d5293e2b7f7819 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-18  Kim F. Storm  <storm@cua.dk>
+
+       * scroll-lock.el: Fix errors due to incorrect line wrapping.
+
 2005-08-18  Richard M. Stallman  <rms@gnu.org>
 
        * scroll-lock.el: New file.
@@ -53,8 +57,7 @@
        for backward compatibility for faces that did not appear in the
        previous Emacs release.
 
-       * simple.el (next-error-follow-minor-mode): Fix init value and
-       ligher.
+       * simple.el (next-error-follow-minor-mode): Fix init value and lighter.
 
 2005-08-15  Kim F. Storm  <storm@cua.dk>
 
@@ -117,12 +120,9 @@
        * progmodes/sh-script.el (sh-font-lock-keywords-var): Variable
        renamed from sh-font-lock-keywords.  In the `shell' entry, don't
        try to refer to executable-font-lock-keywords.
-       (sh-font-lock-keywords-var-1): Renamed from
-       sh-font-lock-keywords-1.
-       (sh-font-lock-keywords-var-2): Renamed from
-       sh-font-lock-keywords-2.
-       (sh-font-lock-keywords): Append executable-font-lock-keywords
-       here.
+       (sh-font-lock-keywords-var-1): Renamed from sh-font-lock-keywords-1.
+       (sh-font-lock-keywords-var-2): Renamed from sh-font-lock-keywords-2.
+       (sh-font-lock-keywords): Append executable-font-lock-keywords here.
        (sh-mode): Set comment-start-skip, local-abbrev-table,
        imenu-case-fold-search.
        (sh-set-shell): Don't set them here.