# HG changeset patch # User Richard M. Stallman # Date 763284452 0 # Node ID 676773222f1f67590f74fcc5ced858937a4fccdd # Parent 27515aae66a83a5da3b9e3748781991b086b5aa2 (emerge-revisions, emerge-revisions-with-ancestor) (emerge-merge-directories): Add autoloads. diff -r 27515aae66a8 -r 676773222f1f lisp/emerge.el --- a/lisp/emerge.el Thu Mar 10 07:25:09 1994 +0000 +++ b/lisp/emerge.el Thu Mar 10 07:27:32 1994 +0000 @@ -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 @@ ;;; 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 @@ quit-hooks) quit-hooks))) +;;;###autoload (defun emerge-revisions-with-ancestor (arg file revision-A revision-B ancestor &optional @@ -1247,6 +1250,7 @@ (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