[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v |
Date: |
Sat, 20 Oct 2007 01:52:23 +0000 |
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.
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Richard M. Stallman, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, John Paul Wallington, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Miles Bader, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2007/10/19
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Eric S. Raymond, 2007/10/20
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2007/10/20
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2007/10/20
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Jay Belanger, 2007/10/20
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Eric S. Raymond, 2007/10/20
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Eric S. Raymond, 2007/10/20