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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/08/16 20:04:39

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11049.2.225
retrieving revision 1.11049.2.226
diff -u -b -r1.11049.2.225 -r1.11049.2.226
--- ChangeLog   16 Aug 2007 14:20:37 -0000      1.11049.2.225
+++ ChangeLog   16 Aug 2007 20:04:36 -0000      1.11049.2.226
@@ -1,5 +1,11 @@
 2007-08-16  Stefan Monnier  <address@hidden>
 
+       * smerge-mode.el (smerge-resolve): New arg `safe'.
+       (smerge-resolve-all, smerge-batch-resolve): New function.
+       (smerge-refine): Make sure `diff' returns the expected result.
+       (smerge-parsep-re): New const.
+       (smerge-mode): Use it to adjust paragraph-separate.
+
        * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
        Correctly match / regexp matchers as first char on a line when
        fontifying only that line.