# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1124377435 0
# Node ID 99065de2f7e56f1603e5b224c29565383d12043f
# Parent  126c81827d58b39f246199c2796150944c5a8a1f
*** empty log message ***

diff -r 126c81827d58 -r 99065de2f7e5 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 18 15:03:37 2005 +0000
+++ b/lisp/ChangeLog	Thu Aug 18 15:03:55 2005 +0000
@@ -53,8 +53,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 +116,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.