From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 10 Mar 1994 07:27:32 +0000 (+0000)
Subject: (emerge-revisions, emerge-revisions-with-ancestor)
X-Git-Tag: emacs-19.34~9566
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9343c8eea73157ec02468a20ba8fb99456f35cb8;p=emacs.git

(emerge-revisions, emerge-revisions-with-ancestor)
(emerge-merge-directories): Add autoloads.
---

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