aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-02-12 01:18:35 +0000
committerJuanma Barranquero2008-02-12 01:18:35 +0000
commitd218b4e5d2ec290c7be64d3ea264359095a3aee0 (patch)
tree2cdd97dbfbc2d618d9509be8488b7ed871ffb6ef
parent723e5b84bb1c1a0e3293b4aa95cc5e5f30ceb8b7 (diff)
downloademacs-d218b4e5d2ec290c7be64d3ea264359095a3aee0.tar.gz
emacs-d218b4e5d2ec290c7be64d3ea264359095a3aee0.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog4
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 @@
12008-02-11 Drew Adams <drew.adams@oracle.com> 12008-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
72008-02-11 Stefan Monnier <monnier@iro.umontreal.ca> 62008-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
592008-02-10 Bastien Guerry <bzg@altern.org> 572008-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.