[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch] ediff-directories and wildcard expansion
From: |
David Abrahams |
Subject: |
[patch] ediff-directories and wildcard expansion |
Date: |
Mon, 20 Nov 2006 11:55:45 -0500 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) Emacs/23.0.0 (gnu/linux) |
When I do ediff-directories and either directory name I supply
contains "~/", indicating my home direcetory, everything works fine
except for
==: for each session, show which files are identical
=h: like ==, but also marks those sessions for hiding
=m: like ==, but also marks those sessions for operation
Which, it turns out, is due to a failure to expand the wildcard when
invoking "cmp" in ediff-same-file-contents.
Here's a patch that fixes it:
diff -bu -L /usr/local/share/emacs/23.0.0/lisp/ediff-diff.el.gz -L
/tmp/buffer-content-3192107C /tmp/jka-com31921BGJ /tmp/buffer-content-3192107C
--- /usr/local/share/emacs/23.0.0/lisp/ediff-diff.el.gz
+++ /tmp/buffer-content-3192107C
@@ -1450,7 +1450,7 @@
(condition-case nil
(let ((res
(apply 'call-process ediff-cmp-program nil nil nil
- (append ediff-cmp-options (list f1 f2)))))
+ (append ediff-cmp-options (list (expand-file-name f1)
(expand-file-name f2))))))
(and (numberp res) (eq res 0)))
(error (format "Cannot execute program %S." ediff-cmp-program)))
))
Diff finished. Mon Nov 20 11:54:04 2006
[I hereby place this patch into the public domain -- use it under any
terms you like, including GPL]
--
Dave Abrahams
Boost Consulting
www.boost-consulting.com
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [patch] ediff-directories and wildcard expansion,
David Abrahams <=