diff options
| -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 @@ | |||
| 32 | ;;;###autoload | 32 | ;;;###autoload |
| 33 | (define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor] | 33 | (define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor] |
| 34 | '("Revisions with Ancestor ..." . emerge-revisions-with-ancestor)) | 34 | '("Revisions with Ancestor ..." . emerge-revisions-with-ancestor)) |
| 35 | ;;;###autoload | ||
| 35 | (define-key menu-bar-emerge-menu [emerge-revisions] | 36 | (define-key menu-bar-emerge-menu [emerge-revisions] |
| 36 | '("Revisions ..." . emerge-revisions)) | 37 | '("Revisions ..." . emerge-revisions)) |
| 37 | ;;;###autoload | 38 | ;;;###autoload |
| @@ -1013,6 +1014,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") | |||
| 1013 | 1014 | ||
| 1014 | ;;; Functions to start Emerge on RCS versions | 1015 | ;;; Functions to start Emerge on RCS versions |
| 1015 | 1016 | ||
| 1017 | ;;;###autoload | ||
| 1016 | (defun emerge-revisions (arg file revision-A revision-B | 1018 | (defun emerge-revisions (arg file revision-A revision-B |
| 1017 | &optional startup-hooks quit-hooks) | 1019 | &optional startup-hooks quit-hooks) |
| 1018 | "Emerge two RCS revisions of a file." | 1020 | "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.") | |||
| 1032 | quit-hooks) | 1034 | quit-hooks) |
| 1033 | quit-hooks))) | 1035 | quit-hooks))) |
| 1034 | 1036 | ||
| 1037 | ;;;###autoload | ||
| 1035 | (defun emerge-revisions-with-ancestor (arg file revision-A | 1038 | (defun emerge-revisions-with-ancestor (arg file revision-A |
| 1036 | revision-B ancestor | 1039 | revision-B ancestor |
| 1037 | &optional | 1040 | &optional |
| @@ -1247,6 +1250,7 @@ Otherwise, the A or B file present is copied to the output file." | |||
| 1247 | (defvar emerge-merge-directories-filename-regexp "[^.]" | 1250 | (defvar emerge-merge-directories-filename-regexp "[^.]" |
| 1248 | "Regexp describing files to be processed by `emerge-merge-directories'.") | 1251 | "Regexp describing files to be processed by `emerge-merge-directories'.") |
| 1249 | 1252 | ||
| 1253 | ;;;###autoload | ||
| 1250 | (defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir) | 1254 | (defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir) |
| 1251 | (interactive | 1255 | (interactive |
| 1252 | (list | 1256 | (list |