Mercurial > emacs
comparison lisp/ediff-init.el @ 43714:1c34b0b56515
* 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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Tue, 05 Mar 2002 05:34:19 +0000 |
| parents | 69c91aaa067a |
| children | 182881d68883 |
comparison
equal
deleted
inserted
replaced
| 43713:f92c4d87863a | 43714:1c34b0b56515 |
|---|---|
| 342 (defsubst ediff-one-filegroup-metajob (&optional metajob) | 342 (defsubst ediff-one-filegroup-metajob (&optional metajob) |
| 343 (or (ediff-revision-metajob metajob) | 343 (or (ediff-revision-metajob metajob) |
| 344 (ediff-patch-metajob metajob) | 344 (ediff-patch-metajob metajob) |
| 345 ;; add more here | 345 ;; add more here |
| 346 )) | 346 )) |
| 347 ;; jobs suitable for the operation of collecting diffs into a multifile patch | |
| 347 (defsubst ediff-collect-diffs-metajob (&optional metajob) | 348 (defsubst ediff-collect-diffs-metajob (&optional metajob) |
| 348 (memq (or metajob ediff-metajob-name) | 349 (memq (or metajob ediff-metajob-name) |
| 349 '(ediff-directories | 350 '(ediff-directories |
| 350 ediff-directory-revisions | |
| 351 ediff-merge-directories | 351 ediff-merge-directories |
| 352 ediff-merge-directories-with-ancestor | 352 ediff-merge-directories-with-ancestor |
| 353 ediff-directory-revisions | |
| 353 ediff-merge-directory-revisions | 354 ediff-merge-directory-revisions |
| 354 ediff-merge-directory-revisions-with-ancestor | 355 ediff-merge-directory-revisions-with-ancestor |
| 355 ;; add more here | 356 ;; add more here |
| 356 ))) | 357 ))) |
| 357 (defsubst ediff-merge-metajob (&optional metajob) | 358 (defsubst ediff-merge-metajob (&optional metajob) |