summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2008-02-12 01:18:35 +0000
committerJuanma Barranquero <lekktu@gmail.com>2008-02-12 01:18:35 +0000
commitd218b4e5d2ec290c7be64d3ea264359095a3aee0 (patch)
tree2cdd97dbfbc2d618d9509be8488b7ed871ffb6ef
parent723e5b84bb1c1a0e3293b4aa95cc5e5f30ceb8b7 (diff)
downloademacs-d218b4e5d2ec290c7be64d3ea264359095a3aee0.tar.gz
emacs-d218b4e5d2ec290c7be64d3ea264359095a3aee0.tar.bz2
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 @@
2008-02-11 Drew Adams <drew.adams@oracle.com>
- * isearch.el:
- (isearch-fail): New face.
+ * isearch.el (isearch-fail): New face.
(isearch-message): Highlight failure part of input.
2008-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -55,7 +54,6 @@
* calendar/time-date.el (emacs-uptime): New function.
->>>>>>> 1.12767
2008-02-10 Bastien Guerry <bzg@altern.org>
* mail/rmail.el (rmail-nonignored-headers): Allow to be nil.