aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ediff-hook.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-hook.el')
-rw-r--r--lisp/ediff-hook.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 74e3c9c72d6..019db0a42af 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -113,6 +113,8 @@
113 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) 113 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
114 114
115 ;; define ediff-menu 115 ;; define ediff-menu
116 (define-key menu-bar-ediff-menu [window]
117 '("This Window And Next Window" . compare-windows))
116 (define-key menu-bar-ediff-menu [ediff-dir-revision] 118 (define-key menu-bar-ediff-menu [ediff-dir-revision]
117 '("Directory Revisions ..." . ediff-directory-revisions)) 119 '("Directory Revisions ..." . ediff-directory-revisions))
118 (define-key menu-bar-ediff-menu [ediff-revision] 120 (define-key menu-bar-ediff-menu [ediff-revision]
@@ -183,7 +185,7 @@
183 185
184 ) ; cond 186 ) ; cond
185 187
186;; arrange foe autoloads 188;; arrange for autoloads
187(if purify-flag 189(if purify-flag
188 () ; if dumping, autoloads are set up in loaddefs.el 190 () ; if dumping, autoloads are set up in loaddefs.el
189 ;; if the user decides to load this file, set up autoloads 191 ;; if the user decides to load this file, set up autoloads
@@ -260,10 +262,16 @@
260 "ediff" 262 "ediff"
261 "Merge versions of files in a directory using other versions as ancestors" 263 "Merge versions of files in a directory using other versions as ancestors"
262 t) 264 t)
265
266 ;; misc
263 (autoload 'ediff-show-registry 267 (autoload 'ediff-show-registry
264 "ediff-meta" 268 "ediff-meta"
265 "Display the registry of active Ediff sessions" 269 "Display the registry of active Ediff sessions"
266 t) 270 t)
271 (autoload 'ediff-version
272 "ediff"
273 "Show Ediff's version and last modification date"
274 t)
267 ) ; if purify-flag 275 ) ; if purify-flag
268 276
269 277