# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1192969552 0
# Node ID 85ee0a16a86f5979bdfa6df1974ae64364708e9e
# Parent  b31c7731df51c2bd716625bcdac5a5c20c1866c6
*** empty log message ***

diff -r b31c7731df51 -r 85ee0a16a86f lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 21 10:53:16 2007 +0000
+++ b/lisp/ChangeLog	Sun Oct 21 12:25:52 2007 +0000
@@ -21,8 +21,7 @@
 	* eshell/esh-mode.el (eshell-handle-ansi-color): Require
 	ansi-color at compile time too.
 
-	* eshell/em-unix.el (eshell/info): Require info at compile time
-	too.
+	* eshell/em-unix.el (eshell/info): Require info at compile time too.
 
 	* w32-fns.el: Require w32-vars.
 
@@ -63,7 +62,7 @@
 	* term/w32-win.el: Require w32-vars.
 	(w32-color-map): Pacify byte-compiler.
 
-	* loadup.el: Load w32-wars before term/w32-win.
+	* loadup.el: Load w32-vars before term/w32-win.
 
 2007-10-20  Juri Linkov  <juri@jurta.org>
 
@@ -88,11 +87,11 @@
 	* term/x-win.el (x-gtk-stock-map, icon-map-list)
 	(x-gtk-map-stock): Delete duplicated definitions from merge.
 
-	* progmodes/octave-mod.el: Require octave-inf at compile time
+	* progmodes/octave-mod.el: Require octave-inf at compile time.
 
 	* progmodes/compile.el (compilation-skip-to-next-location)
-	(compilation-skip-threshold, compilation-skip-visited): Move
-	definitions earlier.
+	(compilation-skip-threshold, compilation-skip-visited):
+	Move definitions earlier.
 
 	* play/decipher.el (decipher-keypress):
 	* play/zone.el (zone-fall-through-ws):
@@ -105,8 +104,8 @@
 	(scroll-lock-previous-line):
 	* image-dired.el (image-dired-next-line)
 	(image-dired-previous-line):
-	* ediff-help.el (ediff-help-message-line-length): Use
-	forward-line.
+	* ediff-help.el (ediff-help-message-line-length):
+	Use forward-line.
 
 	* smerge-mode.el (smerge-auto-refine):
 	* diff-mode.el (diff-auto-refine): Add :group.