[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el |
Date: |
Fri, 18 Feb 2005 23:46:28 -0500 |
Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.35 emacs/lisp/ediff-mult.el:1.36
*** emacs/lisp/ediff-mult.el:1.35 Sat Jul 10 10:50:27 2004
--- emacs/lisp/ediff-mult.el Sat Feb 19 04:46:24 2005
***************
*** 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.
;; Author: Michael Kifer <address@hidden>
--- 1,6 ----
;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
! ;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02, 05 Free Software
Foundation, Inc.
;; Author: Michael Kifer <address@hidden>
***************
*** 167,172 ****
--- 167,175 ----
;; 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,2354 ****
--- 2352,2358 ----
))
(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,2367 ****
(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))
))
--- 2360,2370 ----
(defun ediff-mark-if-equal (fileinfo1 fileinfo2)
(let ((f1 (car fileinfo1))
(f2 (car fileinfo2)))
! (if (and (stringp f1) (stringp f2) (ediff-same-contents f1 f2))
! (progn
! (ediff-set-file-eqstatus fileinfo1 t)
! (ediff-set-file-eqstatus fileinfo2 t)
! ))
))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,
Michael Kifer <=