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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/03/08 20:12:55

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10790
retrieving revision 1.10791
diff -u -b -r1.10790 -r1.10791
--- ChangeLog   8 Mar 2007 18:31:13 -0000       1.10790
+++ ChangeLog   8 Mar 2007 20:12:55 -0000       1.10791
@@ -1,3 +1,8 @@
+2007-03-08  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el (smerge-remove-props): Don't mark the buffer modified.
+       (debug-ignored-errors): Add entry from smerge-match-conflict.
+
 2007-03-08  J.D. Smith  <address@hidden>
 
        * progmodes/idlw-help.el (idlwave-do-context-help1): Don't visit
@@ -7,7 +12,7 @@
 
 2007-03-08  Chong Yidong  <address@hidden>
 
-       * replace.el (occur-engine): buffer-undo-list binding moved...
+       * replace.el (occur-engine): Move buffer-undo-list binding...
        (occur-1): ...to here.
        
        * complete.el (PC-bindings): Rebind M-TAB in read-expression-map.
@@ -25,8 +30,8 @@
 2007-03-07  Miles Bader  <address@hidden>
 
        * international/isearch-x.el
-       (isearch-process-search-multibyte-characters): Strip
-       text-properties from PROMPT to avoid an error from read-string.
+       (isearch-process-search-multibyte-characters):
+       Strip text-properties from PROMPT to avoid an error from read-string.
 
 2007-03-07  Kim F. Storm  <address@hidden>