Mercurial > emacs
comparison lisp/ChangeLog @ 85965:ac6bbbd64b2f
(smerge-refine-subst): Pass "-d" to diff.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 08 Nov 2007 16:58:07 +0000 |
parents | 7f134b676a0c |
children | 90ed3b3932bf |
comparison
equal
deleted
inserted
replaced
85964:905499f8c560 | 85965:ac6bbbd64b2f |
---|---|
1 2007-11-08 Stefan Monnier <monnier@iro.umontreal.ca> | |
2 | |
3 * smerge-mode.el (smerge-refine-subst): Pass "-d" to diff. | |
4 | |
1 2007-11-07 Michael Albinus <michael.albinus@gmx.de> | 5 2007-11-07 Michael Albinus <michael.albinus@gmx.de> |
2 | 6 |
3 * net/tramp.el (tramp-handle-substitute-in-file-name): Don't | 7 * net/tramp.el (tramp-handle-substitute-in-file-name): |
4 expand the remote connection identification. | 8 Don't expand the remote connection identification. |
5 (tramp-find-shell, tramp-open-connection-setup-interactive-shell): | 9 (tramp-find-shell, tramp-open-connection-setup-interactive-shell): |
6 Set also $PS2 and $PS3 when setting $PS1. Check for shell echoing | 10 Set also $PS2 and $PS3 when setting $PS1. Check for shell echoing |
7 before calling stty. | 11 before calling stty. |
8 | 12 |
9 * net/tramp-cache.el (tramp-cache-print) | 13 * net/tramp-cache.el (tramp-cache-print) |
10 (tramp-dump-connection-properties): Fix docstring. | 14 (tramp-dump-connection-properties): Fix docstring. |
11 (tramp-list-connections): Renamed from | 15 (tramp-list-connections): Rename from |
12 `tramp-cache-list-connections'. | 16 `tramp-cache-list-connections'. |
13 | 17 |
14 * net/tramp-cmds.el (tramp-cleanup-connection): Apply it. | 18 * net/tramp-cmds.el (tramp-cleanup-connection): Apply it. |
15 | 19 |
16 * net/tramp-ftp.el (tramp-ftp-file-name-handler): Don't expand the | 20 * net/tramp-ftp.el (tramp-ftp-file-name-handler): Don't expand the |