diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/smerge-mode.el | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11cf35c54ed..d78f776bc19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,14 +1,18 @@ +2007-11-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * smerge-mode.el (smerge-refine-subst): Pass "-d" to diff. + 2007-11-07 Michael Albinus <michael.albinus@gmx.de> - * 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. diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index cd5c7c20f8d..18ca1a34181 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -790,12 +790,17 @@ replace chars to try and eliminate some spurious differences." (unwind-protect (with-temp-buffer (let ((coding-system-for-read 'emacs-mule)) - ;; Don't forget -a to make sure diff treats it as a text file - ;; even if it contains \0 and such. (call-process diff-command nil t nil (if (and smerge-refine-ignore-whitespace (not smerge-refine-weight-hack)) - "-aw" "-a") + ;; Pass -a so diff treats it as a text file even + ;; if it contains \0 and such. + ;; Pass -d so as to get the smallest change, but + ;; also and more importantly because otherwise it + ;; may happen that diff doesn't behave like + ;; smerge-refine-weight-hack expects it to. + ;; See http://thread.gmane.org/gmane.emacs.devel/82685. + "-awd" "-ad") file1 file2)) ;; Process diff's output. (goto-char (point-min)) |