emacs-pretest-bug
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

problems with M-x ediff-directories


From: Stefan Reichör
Subject: problems with M-x ediff-directories
Date: Thu, 12 Oct 2006 15:37:57 +0200
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux)

Please write in English if possible, because the Emacs maintainers
usually do not have translators to read other languages for them.

Your bug report will be posted to the address@hidden mailing list.

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

M-x ediff-directories doesn't work very well, when a directory that
starts with ~/ is used.

= h doesn't hide equal files!

I tracked the problem down to ediff-same-file-contents

The ediff-cmp-program is executed and tells that are not identical,
because no ~ expansion takes place here.


I have fixed the problem by calling expand-file-name before passing
them to ediff-cmp-program.

Here is the updated ediff-same-file-contents function:

(defun ediff-same-file-contents (f1 f2)
  "Return t if files F1 and F2 have identical contents."
  (if (and (not (file-directory-p f1))
           (not (file-directory-p f2)))
      (condition-case nil
          (let ((res
                 (apply 'call-process ediff-cmp-program nil nil nil
                        (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)))
    ))


Stefan.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]