Mercurial > emacs

changeset 91786:459312b90930

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 12 Feb 2008 01:18:35 +0000
parents eb602dd246b2
children 457a4ba95667
files lisp/ChangeLog
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Feb 12 00:50:44 2008 +0000
+++ b/lisp/ChangeLog	Tue Feb 12 01:18:35 2008 +0000
@@ -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.