Mercurial > emacs
comparison lisp/emerge.el @ 5798:c75960d5f2ca
(menu-bar-emerge-menu): New map.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 06 Feb 1994 02:33:28 +0000 |
parents | b53b2df1351d |
children | e98ae7dec34d |
comparison
equal
deleted
inserted
replaced
5797:c4fff7ff8bdd | 5798:c75960d5f2ca |
---|---|
18 ;; USE OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION, DAMAGES RESULTING FROM | 18 ;; USE OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION, DAMAGES RESULTING FROM |
19 ;; LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL, INCIDENTAL OR CONSEQUENTIAL | 19 ;; LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL, INCIDENTAL OR CONSEQUENTIAL |
20 ;; DAMAGES. | 20 ;; DAMAGES. |
21 | 21 |
22 ;;; Code: | 22 ;;; Code: |
23 | |
24 ;;;###autoload (autoload 'menu-bar-emerge-map "emerge" nil t 'keymap) | |
25 | |
26 (defvar menu-bar-emerge-menu (make-sparse-keymap "menu-bar-emerge-map")) | |
27 (fset 'menu-bar-emerge-map (symbol-value 'menu-bar-emerge-map)) | |
28 | |
29 (define-key menu-bar-emerge-menu [emerge-merge-directories] | |
30 '("Merge Directories ..." . emerge-merge-directories)) | |
31 (define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor] | |
32 '("Revisions with Ancestor ..." . emerge-revisions-with-ancestor)) | |
33 (define-key menu-bar-emerge-menu [emerge-revisions] | |
34 '("Revisions ..." . emerge-revisions)) | |
35 (define-key menu-bar-emerge-menu [emerge-files-with-ancestor] | |
36 '("Files with Ancestor ..." . emerge-files-with-ancestor)) | |
37 (define-key menu-bar-emerge-menu [emerge-files] | |
38 '("Files ..." . emerge-files)) | |
39 (define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor] | |
40 '("Buffers with Ancestor ..." . emerge-buffers-with-ancestor)) | |
41 (define-key menu-bar-emerge-menu [emerge-buffers] | |
42 '("Buffers ..." . emerge-buffers)) | |
23 | 43 |
24 ;;; Macros | 44 ;;; Macros |
25 | 45 |
26 (defmacro emerge-eval-in-buffer (buffer &rest forms) | 46 (defmacro emerge-eval-in-buffer (buffer &rest forms) |
27 "Macro to switch to BUFFER, evaluate FORMS, returns to original buffer. | 47 "Macro to switch to BUFFER, evaluate FORMS, returns to original buffer. |