# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 940427665 0
# Node ID 3195d4a66146366000b404d9996f50c8ef426eee
# Parent  64f5595ba1fbe0edc0760ac54505c02252142f9b
*** empty log message ***

diff -r 64f5595ba1fb -r 3195d4a66146 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 20 13:50:00 1999 +0000
+++ b/lisp/ChangeLog	Wed Oct 20 13:54:25 1999 +0000
@@ -1,3 +1,8 @@
+1999-10-20  Gerd Moellmann  <gerd@gnu.org>
+
+	* dired.el (dired-move-to-filename-regexp): Fix long comment lines
+	that were split so that part of the comment appeared as Lisp code.
+
 1999-10-20  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
 
 	* ps-bdf.el: Doc fix.
@@ -91,6 +96,7 @@
 
 	* emacs-lisp/eval-reg.el: Removed -- not now needed by edebug.
 
+>>>>>>> 1.58
 1999-10-19  Sam Steingold  <sds@ksp.com>
 
 	* map-ynp.el (map-y-or-n-p): Remove extraneous `not' to