# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1101490159 0
# Node ID f4b2f3f54b6a2a34d056167ccab8bdfecc1c4cae
# Parent  09b3936162228d01769e9e966b6467242e2d536e
*** empty log message ***

diff -r 09b393616222 -r f4b2f3f54b6a lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 26 15:44:37 2004 +0000
+++ b/lisp/ChangeLog	Fri Nov 26 17:29:19 2004 +0000
@@ -27,6 +27,21 @@
 	(gdb-frame-assembler-buffer): Rework like
 	gdb-frame-breakpoints-buffer.
 
+2004-11-25  Richard M. Stallman  <rms@gnu.org>
+
+	* progmodes/flymake.el: Reindent.
+	(flymake-split-string):	Turn into defalias.
+	(flymake-fix-file-name): Renamed from flymake-fix-path-name.
+	(flymake-ensure-ends-with-slash): Rename arg to FILENAME.
+	(flymake-get-common-file-prefix): Renamed from ...path...  Doc fix.
+	(flymake-build-relative-filename): Renamed from ...path.
+	Fix error message.
+
+2004-11-25  Cheng Gao  <chenggao@gmail.com>
+
+	* progmodes/flymake.el: Much whitespace and capitalization change.
+	Move `provide' to end.  Require `compile' only when compiling.
+
 2004-11-24  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc-alg.el: Added comment.
@@ -74,6 +89,7 @@
 	(math-simplify-units-quotient): Replace variable try-cancel-units by
 	declared variable.
 
+>>>>>>> 1.6669
 2004-11-24  Richard M. Stallman  <rms@gnu.org>
 
 	* textmodes/ispell.el (ispell-check-version):