[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-init.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-init.el |
Date: |
Tue, 05 Mar 2002 00:34:20 -0500 |
Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.55 emacs/lisp/ediff-init.el:1.56
*** emacs/lisp/ediff-init.el:1.55 Sun Feb 10 01:46:12 2002
--- emacs/lisp/ediff-init.el Tue Mar 5 00:34:19 2002
***************
*** 344,355 ****
(ediff-patch-metajob metajob)
;; add more here
))
(defsubst ediff-collect-diffs-metajob (&optional metajob)
(memq (or metajob ediff-metajob-name)
'(ediff-directories
- ediff-directory-revisions
ediff-merge-directories
ediff-merge-directories-with-ancestor
ediff-merge-directory-revisions
ediff-merge-directory-revisions-with-ancestor
;; add more here
--- 344,356 ----
(ediff-patch-metajob metajob)
;; add more here
))
+ ;; jobs suitable for the operation of collecting diffs into a multifile patch
(defsubst ediff-collect-diffs-metajob (&optional metajob)
(memq (or metajob ediff-metajob-name)
'(ediff-directories
ediff-merge-directories
ediff-merge-directories-with-ancestor
+ ediff-directory-revisions
ediff-merge-directory-revisions
ediff-merge-directory-revisions-with-ancestor
;; add more here
- [Emacs-diffs] Changes to emacs/lisp/ediff-init.el,
Michael Kifer <=