Mercurial > emacs

changeset 13215:e0ee1eaaabc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Now defines [window] in menu-bar-ediff-menu.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sat, 14 Oct 1995 03:12:53 +0000
parents bc4eeb585ff1
children b9dc8cc658d5
files lisp/ediff-hook.el
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff-hook.el	Sat Oct 14 02:32:56 1995 +0000
+++ b/lisp/ediff-hook.el	Sat Oct 14 03:12:53 1995 +0000
@@ -113,6 +113,8 @@
        (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-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]
 	 '("Directory Revisions ..." . ediff-directory-revisions))
        (define-key menu-bar-ediff-menu [ediff-revision]
@@ -183,7 +185,7 @@
       
       ) ; cond
 
-;; arrange foe autoloads
+;; arrange for autoloads
 (if purify-flag
     () ; if dumping, autoloads are set up in loaddefs.el
   ;; if the user decides to load this file, set up autoloads
@@ -260,10 +262,16 @@
     "ediff"
     "Merge versions of files in a directory using other versions as ancestors"
     t)
+
+  ;; misc
   (autoload 'ediff-show-registry
     "ediff-meta"
     "Display the registry of active Ediff sessions"
     t)
+  (autoload 'ediff-version
+    "ediff"
+    "Show Ediff's version and last modification date"
+    t)
   ) ; if purify-flag