From f5f3efaaae58d86b526801b8313774c4d3826f6d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 23 Jun 2001 07:51:03 +0000 Subject: [PATCH] Fix some formatting errors, and a left-over from some unsuccessful merge. --- lisp/ChangeLog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8cb663ba4ce..d1b36b4003e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -39,7 +39,7 @@ Also, added a comment describing how to greatly speedup Eshell loadup time, by concatenating together all of Eshell's .elc files. -2001-06-18 John Wiegley +2001-06-19 John Wiegley * eshell/esh-mode.el: Disabled a test that often yields false failures. @@ -209,7 +209,6 @@ * server.el (server-process, server-buffer-clients): Doc fix. From Pavel Jan,Bm(Bk . ->>>>>>> 1.2419 2001-06-09 John Wiegley * eshell/esh-cmd.el (eshell-exit-success-p): Use a string-match to -- 2.39.5