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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/11/08 16:58:09

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12170
retrieving revision 1.12171
diff -u -b -r1.12170 -r1.12171
--- ChangeLog   7 Nov 2007 20:41:12 -0000       1.12170
+++ ChangeLog   8 Nov 2007 16:58:07 -0000       1.12171
@@ -1,14 +1,18 @@
+2007-11-08  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el (smerge-refine-subst): Pass "-d" to diff.
+
 2007-11-07  Michael Albinus  <address@hidden>
 
-       * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
-       expand the remote connection identification.
+       * net/tramp.el (tramp-handle-substitute-in-file-name):
+       Don't expand the remote connection identification.
        (tramp-find-shell, tramp-open-connection-setup-interactive-shell):
        Set also $PS2 and $PS3 when setting $PS1.  Check for shell echoing
        before calling stty.
 
        * net/tramp-cache.el (tramp-cache-print)
        (tramp-dump-connection-properties): Fix docstring.
-       (tramp-list-connections): Renamed from
+       (tramp-list-connections): Rename from
        `tramp-cache-list-connections'.
 
        * net/tramp-cmds.el (tramp-cleanup-connection): Apply it.