Merged from miles@gnu.org--gnu-2005 (patch 17-26, 107-116)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-107
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-108
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-109
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-110
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-112
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-113
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-114
   <no summary provided>

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-115
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-116
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-17
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-18
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-19
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-20
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-21
   More work on moving images to etc/images

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-22
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-23
   Fix errors with image-file installation

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-24
   etc/Makefile.in (install): Put gnus-tut.txt in the right place.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-25
   etc/Makefile.in (install, uninstall): Fix installed image dirs.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-26
   etc/Makefile.in (install): Create $(etcdir)/images/gnus dir.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-296

1 files changed, 10 insertions, 7 deletions

diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index cf6edc2d129..41a7699cfdc 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1,6 +1,6 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
-;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -167,6 +167,9 @@ directories.")
 ;; buffer used to collect custom diffs from individual sessions in the group
 (ediff-defvar-local ediff-meta-diff-buffer nil "")
 
+;; t means recurse into subdirs when deciding which files have same contents
+(ediff-defvar-local ediff-recurse-to-subdirectories nil "")
+
 ;; history var to use for filtering groups of files
 (defvar ediff-filtering-regexp-history nil "")
 
@@ -2349,6 +2352,7 @@ last-command-char is used to decide which action to take."
                 ))
       (setq list (cdr list)))
     (message "Comparing files ... Done"))
+  (setq ediff-recurse-to-subdirectories nil)
   (ediff-update-meta-buffer (current-buffer) 'must-redraw))
 
 ;; mark files 1 and 2 as equal, if they are.
@@ -2356,12 +2360,11 @@ last-command-char is used to decide which action to take."
 (defun ediff-mark-if-equal (fileinfo1 fileinfo2)
   (let ((f1 (car fileinfo1))
         (f2 (car fileinfo2)))
-    (cond ((file-directory-p f1) nil)
-          ((file-directory-p f2) nil)
-          ((ediff-same-file-contents f1 f2)
-           (ediff-set-file-eqstatus fileinfo1 t)
-           (ediff-set-file-eqstatus fileinfo2 t)
-           t))
+    (if (and (stringp f1) (stringp f2) (ediff-same-contents f1 f2))
+        (progn
+          (ediff-set-file-eqstatus fileinfo1 t)
+          (ediff-set-file-eqstatus fileinfo2 t)
+          ))
     ))