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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/10/09 03:38:58

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11871
retrieving revision 1.11872
diff -u -b -r1.11871 -r1.11872
--- ChangeLog   8 Oct 2007 23:27:38 -0000       1.11871
+++ ChangeLog   9 Oct 2007 03:38:57 -0000       1.11872
@@ -1,3 +1,10 @@
+2007-10-09  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el (smerge-refine-chopup-region): Add `preproc' argument.
+       (smerge-refine-highlight-change): Add `props' argument.
+       (smerge-refine-subst): New function holding most of smerge-refine.
+       (smerge-refine): Use it.
+
 2007-10-08  Eric S. Raymond  <address@hidden>
 
        *  vc.el (vc-default-wash-log): Remove unused code, the
@@ -7,8 +14,7 @@
 
 2007-10-08  Michael Albinus  <address@hidden>
 
-       * net/tramp.el (tramp-find-foreign-file-name-handler): Check also
-       host.
+       * net/tramp.el (tramp-find-foreign-file-name-handler): Check also host.
        (tramp-maybe-send-script): Apply `member' but `memq'.
        (tramp-advice-file-expand-wildcards): Simplify implementation.
 
@@ -57,8 +63,8 @@
 
        * net/tramp-compat.el (top): Load tramp-util.el and tramp-vc.el.
 
-       * net/tramp-fish.el (tramp-fish-handle-process-file): Rewrite
-       temporary file handling.
+       * net/tramp-fish.el (tramp-fish-handle-process-file):
+       Rewrite temporary file handling.
 
 2007-10-06  Eric S. Raymond  <address@hidden>