diff options
| author | Eli Zaretskii | 2001-06-23 07:51:03 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-06-23 07:51:03 +0000 |
| commit | f5f3efaaae58d86b526801b8313774c4d3826f6d (patch) | |
| tree | c5a3607ff4498259ff937046f019d6e3e190bae8 | |
| parent | bb124d48ea3744a0e40ba4a35fa2036a7dae3b32 (diff) | |
| download | emacs-f5f3efaaae58d86b526801b8313774c4d3826f6d.tar.gz emacs-f5f3efaaae58d86b526801b8313774c4d3826f6d.zip | |
Fix some formatting errors, and a left-over from some unsuccessful merge.
| -rw-r--r-- | lisp/ChangeLog | 3 |
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 | ||
| 42 | 2001-06-18 John Wiegley <johnw@gnu.org> | 42 | 2001-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 | ||
| 213 | 2001-06-09 John Wiegley <johnw@gnu.org> | 212 | 2001-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 |