diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-03-10 07:27:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-03-10 07:27:32 +0000 |
| commit | 34a28d698ea6ad25d2b8784f9bb0c6ad4bd3379f (patch) | |
| tree | bdfffaa8663d41e9c4ecfe5b62cde4f215a009df /lisp/emerge.el | |
| parent | b79b22869e651e0802f6ec8cc6621126a8c1c8ae (diff) | |
| download | emacs-34a28d698ea6ad25d2b8784f9bb0c6ad4bd3379f.tar.gz | |
(emerge-revisions, emerge-revisions-with-ancestor)
(emerge-merge-directories): Add autoloads.
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index 297b23d8619..1bab1ce5099 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -32,6 +32,7 @@ ;;;###autoload (define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor] '("Revisions with Ancestor ..." . emerge-revisions-with-ancestor)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-revisions] '("Revisions ..." . emerge-revisions)) ;;;###autoload @@ -1013,6 +1014,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") ;;; Functions to start Emerge on RCS versions +;;;###autoload (defun emerge-revisions (arg file revision-A revision-B &optional startup-hooks quit-hooks) "Emerge two RCS revisions of a file." @@ -1032,6 +1034,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") quit-hooks) quit-hooks))) +;;;###autoload (defun emerge-revisions-with-ancestor (arg file revision-A revision-B ancestor &optional @@ -1247,6 +1250,7 @@ Otherwise, the A or B file present is copied to the output file." (defvar emerge-merge-directories-filename-regexp "[^.]" "Regexp describing files to be processed by `emerge-merge-directories'.") +;;;###autoload (defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir) (interactive (list |