[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/02/12 01:18:37

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12768
retrieving revision 1.12769
diff -u -b -r1.12768 -r1.12769
--- ChangeLog   12 Feb 2008 00:50:41 -0000      1.12768
+++ ChangeLog   12 Feb 2008 01:18:35 -0000      1.12769
@@ -1,7 +1,6 @@
 2008-02-11 Drew Adams  <address@hidden>
 
-       * isearch.el:
-       (isearch-fail): New face.
+       * isearch.el (isearch-fail): New face.
        (isearch-message): Highlight failure part of input.
 
 2008-02-11  Stefan Monnier  <address@hidden>
@@ -55,7 +54,6 @@
 
        * calendar/time-date.el (emacs-uptime): New function.
 
->>>>>>> 1.12767
 2008-02-10  Bastien Guerry  <address@hidden>
 
        * mail/rmail.el (rmail-nonignored-headers): Allow to be nil.