[patch] ediff-directories and wildcard expansion

[patch] ediff-directories and wildcard expansion

[David Abrahams]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]


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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ediff-diff.el.patch --]
[-- Type: text/x-patch, Size: 641 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 163 bytes --]


[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

[-- Attachment #4: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel