diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-03-05 05:34:19 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-03-05 05:34:19 +0000 |
| commit | c3912d548fb1e6d97b07e47a91f2e0e1da5e27e2 (patch) | |
| tree | 236a904f0ae2a5e2db9979d2f51dd2f731ee50b5 /lisp/ediff-init.el | |
| parent | 31ade731e6dc0c0a4c124f93a1f0018e245a27a2 (diff) | |
| download | emacs-c3912d548fb1e6d97b07e47a91f2e0e1da5e27e2.tar.gz | |
* ediff-init.el: comments.
* ediff-hook.el: Got rid of autoloads. Not needed, since the hook
is loaded.
* ediff-mult.el (ediff-intersect-directories,
ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision):
cleanup.
(ediff-draw-dir-diffs): now supports the "C" command in directory
difference buffer.
(ediff-dir-diff-copy-file): new function that implements copying
of files from one Ediff dir to another
(ediff-bury-dir-diffs-buffer): kills the buffer instead.
(ediff-append-custom-diff): better error msgs.
* ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix.
(ediff-inferior-compare-regions): Use
ediff-clone-buffer-for-region-comparison. Better and simpler interface.
* ediff.el (ediff-directories-internal): Cleanup.
(ediff-clone-buffer-for-region-comparison): Better interface.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index ae6d05ab40a..cfa1ce9da7d 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -344,12 +344,13 @@ It needs to be killed when we quit the session.") (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-directory-revisions ediff-merge-directories ediff-merge-directories-with-ancestor + ediff-directory-revisions ediff-merge-directory-revisions ediff-merge-directory-revisions-with-ancestor ;; add more here |