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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/10/20 01:52:23

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11991
retrieving revision 1.11992
diff -u -b -r1.11991 -r1.11992
--- ChangeLog   20 Oct 2007 01:46:38 -0000      1.11991
+++ ChangeLog   20 Oct 2007 01:52:22 -0000      1.11992
@@ -1,5 +1,9 @@
 2007-10-20  Stefan Monnier  <address@hidden>
 
+       * smerge-mode.el (smerge-auto-refine): New var.
+       (smerge-next, smerge-prev): Use it.
+       (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
+
        * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
        Add `body' arg.  Cleanup the check-narrow-maybe/re-narrow-maybe mess.