/[emacs]/emacs/lisp/ediff-mult.el
ViewVC logotype

Diff of /emacs/lisp/ediff-mult.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.35 by eliz, Sat Jul 10 10:50:27 2004 UTC revision 1.36 by kifer, Sat Feb 19 04:46:24 2005 UTC
# Line 1  Line 1 
1  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff  ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
2    
3  ;; 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.
4    
5  ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>  ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
6    
# Line 167  directories.") Line 167  directories.")
167  ;; buffer used to collect custom diffs from individual sessions in the group  ;; buffer used to collect custom diffs from individual sessions in the group
168  (ediff-defvar-local ediff-meta-diff-buffer nil "")  (ediff-defvar-local ediff-meta-diff-buffer nil "")
169    
170    ;; t means recurse into subdirs when deciding which files have same contents
171    (ediff-defvar-local ediff-recurse-to-subdirectories nil "")
172    
173  ;; history var to use for filtering groups of files  ;; history var to use for filtering groups of files
174  (defvar ediff-filtering-regexp-history nil "")  (defvar ediff-filtering-regexp-history nil "")
175    
# Line 2349  last-command-char is used to decide whic Line 2352  last-command-char is used to decide whic
2352                  ))                  ))
2353        (setq list (cdr list)))        (setq list (cdr list)))
2354      (message "Comparing files ... Done"))      (message "Comparing files ... Done"))
2355      (setq ediff-recurse-to-subdirectories nil)
2356    (ediff-update-meta-buffer (current-buffer) 'must-redraw))    (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2357    
2358  ;; mark files 1 and 2 as equal, if they are.  ;; mark files 1 and 2 as equal, if they are.
# Line 2356  last-command-char is used to decide whic Line 2360  last-command-char is used to decide whic
2360  (defun ediff-mark-if-equal (fileinfo1 fileinfo2)  (defun ediff-mark-if-equal (fileinfo1 fileinfo2)
2361    (let ((f1 (car fileinfo1))    (let ((f1 (car fileinfo1))
2362          (f2 (car fileinfo2)))          (f2 (car fileinfo2)))
2363      (cond ((file-directory-p f1) nil)      (if (and (stringp f1) (stringp f2) (ediff-same-contents f1 f2))
2364            ((file-directory-p f2) nil)          (progn
2365            ((ediff-same-file-contents f1 f2)            (ediff-set-file-eqstatus fileinfo1 t)
2366             (ediff-set-file-eqstatus fileinfo1 t)            (ediff-set-file-eqstatus fileinfo2 t)
2367             (ediff-set-file-eqstatus fileinfo2 t)            ))
            t))  
2368      ))      ))
2369    
2370    

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26