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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/13 15:10:59

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12779
retrieving revision 1.12780
diff -u -b -r1.12779 -r1.12780
--- lisp/ChangeLog      12 Feb 2008 23:41:59 -0000      1.12779
+++ lisp/ChangeLog      13 Feb 2008 15:10:57 -0000      1.12780
@@ -1,3 +1,8 @@
+2008-02-13  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el (smerge-auto-combine-max-separation): New var.
+       (smerge-auto-combine): New fun.
+
 2008-02-12  Juri Linkov  <address@hidden>
 
        * startup.el (fancy-startup-screen, normal-splash-screen):
@@ -6,8 +11,8 @@
        * desktop.el (after-init-hook): Set inhibit-startup-screen to t
        after reading the desktop.
 
-       * progmodes/compile.el (compilation-auto-jump): Call
-       compile-goto-error only when compilation-auto-jump-to-first-error
+       * progmodes/compile.el (compilation-auto-jump):
+       Call compile-goto-error only when compilation-auto-jump-to-first-error
        is non-nil.
        (compilation-scroll-output): Replace :type 'boolean with a choice
        that has three options including a third option `first-error'.