martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now defines [window] in menu-bar-ediff-menu.

Browse Source
This commit is contained in:
Michael Kifer
1995-10-14 03:12:53 +00:00
parent 04090c34c5
commit f9b2678cbc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/ediff-hook.el
View File

@@ -113,6 +113,8 @@
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
;; define ediff-menu ;; define ediff-menu
(define-key menu-bar-ediff-menu [window]
'("This Window And Next Window" . compare-windows))
(define-key menu-bar-ediff-menu [ediff-dir-revision] (define-key menu-bar-ediff-menu [ediff-dir-revision]
'("Directory Revisions ..." . ediff-directory-revisions)) '("Directory Revisions ..." . ediff-directory-revisions))
(define-key menu-bar-ediff-menu [ediff-revision] (define-key menu-bar-ediff-menu [ediff-revision]
@@ -183,7 +185,7 @@
) ; cond ) ; cond
;; arrange foe autoloads ;; arrange for autoloads
(if purify-flag (if purify-flag
() ; if dumping, autoloads are set up in loaddefs.el () ; if dumping, autoloads are set up in loaddefs.el
;; if the user decides to load this file, set up autoloads ;; if the user decides to load this file, set up autoloads
@@ -260,10 +262,16 @@
"ediff" "ediff"
"Merge versions of files in a directory using other versions as ancestors" "Merge versions of files in a directory using other versions as ancestors"
t) t)
;; misc
(autoload 'ediff-show-registry (autoload 'ediff-show-registry
"ediff-meta" "ediff-meta"
"Display the registry of active Ediff sessions" "Display the registry of active Ediff sessions"
t) t)
(autoload 'ediff-version
"ediff"
"Show Ediff's version and last modification date"
t)
) ; if purify-flag ) ; if purify-flag