diff options
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8a88010753b..21a3158a3c2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | 2008-02-11 Drew Adams <drew.adams@oracle.com> | 1 | 2008-02-11 Drew Adams <drew.adams@oracle.com> |
| 2 | 2 | ||
| 3 | * isearch.el: | 3 | * isearch.el (isearch-fail): New face. |
| 4 | (isearch-fail): New face. | ||
| 5 | (isearch-message): Highlight failure part of input. | 4 | (isearch-message): Highlight failure part of input. |
| 6 | 5 | ||
| 7 | 2008-02-11 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2008-02-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| @@ -55,7 +54,6 @@ | |||
| 55 | 54 | ||
| 56 | * calendar/time-date.el (emacs-uptime): New function. | 55 | * calendar/time-date.el (emacs-uptime): New function. |
| 57 | 56 | ||
| 58 | >>>>>>> 1.12767 | ||
| 59 | 2008-02-10 Bastien Guerry <bzg@altern.org> | 57 | 2008-02-10 Bastien Guerry <bzg@altern.org> |
| 60 | 58 | ||
| 61 | * mail/rmail.el (rmail-nonignored-headers): Allow to be nil. | 59 | * mail/rmail.el (rmail-nonignored-headers): Allow to be nil. |