From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Sat, 14 Oct 1995 03:12:53 +0000 (+0000)
Subject: Now defines [window] in menu-bar-ediff-menu.
X-Git-Tag: emacs-19.34~2645
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9b2678cbcea5ee8e94de3a35ed44efa6ed61612;p=emacs.git

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

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 @@
        (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