aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cb663ba4ce..d1b36b4003e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -39,7 +39,7 @@
39 Also, added a comment describing how to greatly speedup Eshell 39 Also, added a comment describing how to greatly speedup Eshell
40 loadup time, by concatenating together all of Eshell's .elc files. 40 loadup time, by concatenating together all of Eshell's .elc files.
41 41
422001-06-18 John Wiegley <johnw@gnu.org> 422001-06-19 John Wiegley <johnw@gnu.org>
43 43
44 * eshell/esh-mode.el: Disabled a test that often yields false 44 * eshell/esh-mode.el: Disabled a test that often yields false
45 failures. 45 failures.
@@ -209,7 +209,6 @@
209 * server.el (server-process, server-buffer-clients): Doc fix. 209 * server.el (server-process, server-buffer-clients): Doc fix.
210 From Pavel Jan,Bm(Bk <Pavel@Janik.cz>. 210 From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
211 211
212>>>>>>> 1.2419
2132001-06-09 John Wiegley <johnw@gnu.org> 2122001-06-09 John Wiegley <johnw@gnu.org>
214 213
215 * eshell/esh-cmd.el (eshell-exit-success-p): Use a string-match to 214 * eshell/esh-cmd.el (eshell-exit-success-p): Use a string-match to