mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

Make menu bar defines unconditional.

Browse Source 
Don't alter menu-bar-files-menu here; menu-bar.el does that.
This commit is contained in:
Richard M. Stallman 1994-05-14 08:59:22 +00:00
parent c4a6a430aa
commit a1094fc9d0
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lisp/ediff.el
View File

@ -1456,37 +1456,29 @@ Do not start with `~/' or `~user-name/'.")
;;; Note that autoload.el currently looks for cookies
;;; only at top level in the file.
;;;###autoload
(if (not (ediff-if-lucid))
(progn
(defvar menu-bar-epatch-menu (make-sparse-keymap "menu-bar-epatch-map"))
(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
(defvar menu-bar-ediff-menu (make-sparse-keymap "menu-bar-ediff-map"))
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))))
(progn
(defvar menu-bar-epatch-menu (make-sparse-keymap "menu-bar-epatch-map"))
(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
(defvar menu-bar-ediff-menu (make-sparse-keymap "menu-bar-ediff-map"))
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)))
;;;###autoload
(if (not (ediff-if-lucid))
(progn
(define-key menu-bar-ediff-menu [rcs-ediff]
'("With a Revision via RCS ..." . rcs-ediff))
(define-key menu-bar-ediff-menu [vc-ediff]
'("With a Revision via VC ..." . vc-ediff))
(define-key menu-bar-ediff-menu [ediff-buffers]
'("Between Buffers ..." . ediff-buffers))
(define-key menu-bar-ediff-menu [ediff-files]
'("Between Files ..." . ediff-files))))
(progn
(define-key menu-bar-ediff-menu [rcs-ediff]
'("With a Revision via RCS ..." . rcs-ediff))
(define-key menu-bar-ediff-menu [vc-ediff]
'("With a Revision via VC ..." . vc-ediff))
(define-key menu-bar-ediff-menu [ediff-buffers]
'("Between Buffers ..." . ediff-buffers))
(define-key menu-bar-ediff-menu [ediff-files]
'("Between Files ..." . ediff-files)))
;;;###autoload
(if (not (ediff-if-lucid))
(progn
(define-key menu-bar-epatch-menu [ediff-patch-buffer]
'("To a Buffer ..." . ediff-patch-buffer))
(define-key menu-bar-epatch-menu [ediff-patch-file]
'("To a File ..." . ediff-patch-file))
(define-key menu-bar-file-menu [epatch]
'("Apply Patch" . menu-bar-epatch-menu))
(define-key menu-bar-file-menu [ediff]
'("Find Differences" . menu-bar-ediff-menu))))
(progn
(define-key menu-bar-epatch-menu [ediff-patch-buffer]
'("To a Buffer ..." . ediff-patch-buffer))
(define-key menu-bar-epatch-menu [ediff-patch-file]
'("To a File ..." . ediff-patch-file)))
(if (and window-system ediff-want-default-menus (ediff-frame-has-menubar))
(if (ediff-if-lucid)