Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.

(ediff-cond-compile-for-xemacs-or-emacs): Remove. (ediff-window-setup-function): Don't autoload declaration for compiler. (ediff-xemacs-init-menus): Use when rather than if.
author: Glenn Morris 2008-03-05 08:51:06 +0000
committer: Glenn Morris 2008-03-05 08:51:06 +0000
commit: 535b216fa3777d3737416ee4fb8bb1f1c5b5757b (patch)
tree: edd8bfc0bdf1a7b6d155a012b6420221dd5cfe5d
parent: be33e2ee0fd4eae50df6ba76cfaeb0b495cf8dc7 (diff)
download: emacs-535b216fa3777d3737416ee4fb8bb1f1c5b5757b.tar.gz
emacs-535b216fa3777d3737416ee4fb8bb1f1c5b5757b.zip
1 files changed, 177 insertions, 197 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index c44282f33a1..12d9936c1a9 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -45,213 +45,193 @@
 ;; end pacifier
 ;; allow menus to be set up without ediff-wind.el being loaded
-;;;###autoload
 (defvar ediff-window-setup-function)
-;; This macro is used to avoid compilation warnings.
-;; The macro will expand into the form that is appropriate to the
-;; compiler at hand (emacs or xemacs).
-;; The autoload, below, is useless in Emacs because ediff-hook.el
-;; is dumped with emacs, but it is needed in XEmacs
-;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (featurep 'xemacs) xemacs-form emacs-form))
-(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
-  (if (featurep 'xemacs)
-      xemacs-form emacs-form))
 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
 ;; emacs, but it is needed in XEmacs
 ;;;###autoload
-(ediff-cond-compile-for-xemacs-or-emacs
+(if (featurep 'xemacs)
- ;; xemacs form
+    ;; xemacs form
- (defun ediff-xemacs-init-menus ()
+    (defun ediff-xemacs-init-menus ()
-   (if (featurep 'menubar)
+      (when (featurep 'menubar)
-       (progn
+        (add-submenu
-         (add-submenu
+         '("Tools") ediff-menu "OO-Browser...")
-          '("Tools") ediff-menu "OO-Browser...")
+        (add-submenu
-         (add-submenu
+         '("Tools") ediff-merge-menu "OO-Browser...")
-          '("Tools") ediff-merge-menu "OO-Browser...")
+        (add-submenu
-         (add-submenu
+         '("Tools") epatch-menu "OO-Browser...")
-          '("Tools") epatch-menu "OO-Browser...")
+        (add-submenu
-         (add-submenu
+         '("Tools") ediff-misc-menu "OO-Browser...")
-          '("Tools") ediff-misc-menu "OO-Browser...")
+        (add-menu-button
-         (add-menu-button
+         '("Tools") "-------" "OO-Browser...")
-          '("Tools") "-------" "OO-Browser...")
+        )))
-         )))
- nil ; emacs form
- )
 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
 ;; emacs, but it is needed in XEmacs
 ;;;###autoload
-(ediff-cond-compile-for-xemacs-or-emacs
+(if (featurep 'xemacs)
- (progn
+    (progn
-   (defvar ediff-menu
+      (defvar ediff-menu
-     '("Compare"
+        '("Compare"
-       ["Two Files..."  ediff-files t]
+          ["Two Files..."  ediff-files t]
-       ["Two Buffers..." ediff-buffers t]
+          ["Two Buffers..." ediff-buffers t]
-       ["Three Files..."  ediff-files3 t]
+          ["Three Files..."  ediff-files3 t]
-       ["Three Buffers..." ediff-buffers3 t]
+          ["Three Buffers..." ediff-buffers3 t]
-       "---"
+          "---"
-       ["Two Directories..." ediff-directories t]
+          ["Two Directories..." ediff-directories t]
-       ["Three Directories..." ediff-directories3 t]
+          ["Three Directories..." ediff-directories3 t]
-       "---"
+          "---"
-       ["File with Revision..."  ediff-revision t]
+          ["File with Revision..."  ediff-revision t]
-       ["Directory Revisions..."  ediff-directory-revisions t]
+          ["Directory Revisions..."  ediff-directory-revisions t]
-       "---"
+          "---"
-       ["Windows Word-by-word..." ediff-windows-wordwise t]
+          ["Windows Word-by-word..." ediff-windows-wordwise t]
-       ["Windows Line-by-line..." ediff-windows-linewise t]
+          ["Windows Line-by-line..." ediff-windows-linewise t]
-       "---"
+          "---"
-       ["Regions Word-by-word..." ediff-regions-wordwise t]
+          ["Regions Word-by-word..." ediff-regions-wordwise t]
-       ["Regions Line-by-line..." ediff-regions-linewise t]
+          ["Regions Line-by-line..." ediff-regions-linewise t]
-       ))
+          ))
-   (defvar ediff-merge-menu
+      (defvar ediff-merge-menu
-     '("Merge"
+      '("Merge"
-       ["Files..."  ediff-merge-files t]
+        ["Files..."  ediff-merge-files t]
-       ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
+        ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
-       ["Buffers..."  ediff-merge-buffers t]
+        ["Buffers..."  ediff-merge-buffers t]
-       ["Buffers with Ancestor..."
+        ["Buffers with Ancestor..."
-        ediff-merge-buffers-with-ancestor t]
+         ediff-merge-buffers-with-ancestor t]
-       "---"
+        "---"
-       ["Directories..."  ediff-merge-directories t]
+        ["Directories..."  ediff-merge-directories t]
-       ["Directories with Ancestor..."
+        ["Directories with Ancestor..."
-        ediff-merge-directories-with-ancestor t]
+         ediff-merge-directories-with-ancestor t]
-       "---"
+        "---"
-       ["Revisions..."  ediff-merge-revisions t]
+        ["Revisions..."  ediff-merge-revisions t]
-       ["Revisions with Ancestor..."
+        ["Revisions with Ancestor..."
-        ediff-merge-revisions-with-ancestor t]
+         ediff-merge-revisions-with-ancestor t]
-       ["Directory Revisions..." ediff-merge-directory-revisions t]
+        ["Directory Revisions..." ediff-merge-directory-revisions t]
-       ["Directory Revisions with Ancestor..."
+        ["Directory Revisions with Ancestor..."
-        ediff-merge-directory-revisions-with-ancestor t]
+         ediff-merge-directory-revisions-with-ancestor t]
-       ))
+        ))
-   (defvar epatch-menu
+      (defvar epatch-menu
-     '("Apply Patch"
+      '("Apply Patch"
-       ["To a file..."  ediff-patch-file t]
+        ["To a file..."  ediff-patch-file t]
-       ["To a buffer..." ediff-patch-buffer t]
+        ["To a buffer..." ediff-patch-buffer t]
-       ))
+        ))
-   (defvar ediff-misc-menu
+      (defvar ediff-misc-menu
-     '("Ediff Miscellanea"
+      '("Ediff Miscellanea"
-       ["Ediff Manual" ediff-documentation t]
+        ["Ediff Manual" ediff-documentation t]
-       ["Customize Ediff" ediff-customize t]
+        ["Customize Ediff" ediff-customize t]
-       ["List Ediff Sessions" ediff-show-registry t]
+        ["List Ediff Sessions" ediff-show-registry t]
-       ["Use separate frame for Ediff control buffer"
+        ["Use separate frame for Ediff control buffer"
-        ediff-toggle-multiframe
+         ediff-toggle-multiframe
-        :style toggle
+         :style toggle
-        :selected (if (and (featurep 'ediff-util)
+         :selected (if (and (featurep 'ediff-util)
-                           (boundp 'ediff-window-setup-function))
+                            (boundp 'ediff-window-setup-function))
-                      (eq ediff-window-setup-function
+                       (eq ediff-window-setup-function
-                          'ediff-setup-windows-multiframe))]
+                           'ediff-setup-windows-multiframe))]
-       ["Use a toolbar with Ediff control buffer"
+        ["Use a toolbar with Ediff control buffer"
-        ediff-toggle-use-toolbar
+         ediff-toggle-use-toolbar
-        :style toggle
+         :style toggle
-        :selected (if (featurep 'ediff-tbar)
+         :selected (if (featurep 'ediff-tbar)
-                      (ediff-use-toolbar-p))]
+                       (ediff-use-toolbar-p))]))
-       ))
+      ;; put these menus before Object-Oriented-Browser in Tools menu
-   ;; put these menus before Object-Oriented-Browser in Tools menu
+      (if (and (featurep 'menubar) (not (featurep 'infodock))
-   (if (and (featurep 'menubar) (not (featurep 'infodock))
+               (not (featurep 'ediff-hook)))
-            (not (featurep 'ediff-hook)))
+          (ediff-xemacs-init-menus)))
-           (ediff-xemacs-init-menus)))
+  ;; Emacs
+  ;; initialize menu bar keymaps
- ;; Emacs
+  (defvar menu-bar-ediff-misc-menu
- (progn
+    (make-sparse-keymap "Ediff Miscellanea"))
-       ;; initialize menu bar keymaps
+  (fset 'menu-bar-ediff-misc-menu
-       (defvar menu-bar-ediff-misc-menu
+        (symbol-value 'menu-bar-ediff-misc-menu))
-         (make-sparse-keymap "Ediff Miscellanea"))
+  (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
-       (fset 'menu-bar-ediff-misc-menu
+  (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
-             (symbol-value 'menu-bar-ediff-misc-menu))
+  (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
-       (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
+  (fset 'menu-bar-ediff-merge-menu
-       (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
+        (symbol-value 'menu-bar-ediff-merge-menu))
-       (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
+  (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
-       (fset 'menu-bar-ediff-merge-menu
+  (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
-             (symbol-value 'menu-bar-ediff-merge-menu))
-       (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
+  ;; define ediff-menu
-       (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
+  (define-key menu-bar-ediff-menu [window]
+    '("This Window and Next Window" . compare-windows))
-       ;; define ediff-menu
+  (define-key menu-bar-ediff-menu [ediff-windows-linewise]
-       (define-key menu-bar-ediff-menu [window]
+    '("Windows Line-by-line..." . ediff-windows-linewise))
-         '("This Window and Next Window" . compare-windows))
+  (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
-       (define-key menu-bar-ediff-menu [ediff-windows-linewise]
+    '("Windows Word-by-word..." . ediff-windows-wordwise))
-         '("Windows Line-by-line..." . ediff-windows-linewise))
+  (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
-       (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
+  (define-key menu-bar-ediff-menu [ediff-regions-linewise]
-         '("Windows Word-by-word..." . ediff-windows-wordwise))
+    '("Regions Line-by-line..." . ediff-regions-linewise))
-       (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
+  (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
-       (define-key menu-bar-ediff-menu [ediff-regions-linewise]
+    '("Regions Word-by-word..." . ediff-regions-wordwise))
-         '("Regions Line-by-line..." . ediff-regions-linewise))
+  (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
-       (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
+  (define-key menu-bar-ediff-menu [ediff-dir-revision]
-         '("Regions Word-by-word..." . ediff-regions-wordwise))
+    '("Directory Revisions..." . ediff-directory-revisions))
-       (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
+  (define-key menu-bar-ediff-menu [ediff-revision]
-       (define-key menu-bar-ediff-menu [ediff-dir-revision]
+    '("File with Revision..." . ediff-revision))
-         '("Directory Revisions..." . ediff-directory-revisions))
+  (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
-       (define-key menu-bar-ediff-menu [ediff-revision]
+  (define-key menu-bar-ediff-menu [ediff-directories3]
-         '("File with Revision..." . ediff-revision))
+    '("Three Directories..." . ediff-directories3))
-       (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
+  (define-key menu-bar-ediff-menu [ediff-directories]
-       (define-key menu-bar-ediff-menu [ediff-directories3]
+    '("Two Directories..." . ediff-directories))
-         '("Three Directories..." . ediff-directories3))
+  (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
-       (define-key menu-bar-ediff-menu [ediff-directories]
+  (define-key menu-bar-ediff-menu [ediff-buffers3]
-         '("Two Directories..." . ediff-directories))
+    '("Three Buffers..." . ediff-buffers3))
-       (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
+  (define-key menu-bar-ediff-menu [ediff-files3]
-       (define-key menu-bar-ediff-menu [ediff-buffers3]
+    '("Three Files..." . ediff-files3))
-         '("Three Buffers..." . ediff-buffers3))
+  (define-key menu-bar-ediff-menu [ediff-buffers]
-       (define-key menu-bar-ediff-menu [ediff-files3]
+    '("Two Buffers..." . ediff-buffers))
-         '("Three Files..." . ediff-files3))
+  (define-key menu-bar-ediff-menu [ediff-files]
-       (define-key menu-bar-ediff-menu [ediff-buffers]
+    '("Two Files..." . ediff-files))
-         '("Two Buffers..." . ediff-buffers))
-       (define-key menu-bar-ediff-menu [ediff-files]
+  ;; define merge menu
-         '("Two Files..." . ediff-files))
+  (define-key
+    menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
-       ;; define merge menu
+    '("Directory Revisions with Ancestor..."
-       (define-key
+      . ediff-merge-directory-revisions-with-ancestor))
-         menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
+  (define-key
-         '("Directory Revisions with Ancestor..."
+    menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
-           . ediff-merge-directory-revisions-with-ancestor))
+    '("Directory Revisions..." . ediff-merge-directory-revisions))
-       (define-key
+  (define-key
-         menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
+    menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
-         '("Directory Revisions..." . ediff-merge-directory-revisions))
+    '("Revisions with Ancestor..."
-       (define-key
+      . ediff-merge-revisions-with-ancestor))
-         menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
+  (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
-         '("Revisions with Ancestor..."
+    '("Revisions..." . ediff-merge-revisions))
-           . ediff-merge-revisions-with-ancestor))
+  (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
-       (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
+  (define-key
-         '("Revisions..." . ediff-merge-revisions))
+    menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
-       (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
+    '("Directories with Ancestor..."
-       (define-key
+      . ediff-merge-directories-with-ancestor))
-         menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
+  (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
-         '("Directories with Ancestor..."
+    '("Directories..." . ediff-merge-directories))
-           . ediff-merge-directories-with-ancestor))
+  (define-key
-       (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
+    menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
-         '("Directories..." . ediff-merge-directories))
+  (define-key
-       (define-key
+    menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
-         menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
+    '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
-       (define-key
+  (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
-         menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
+    '("Buffers..." . ediff-merge-buffers))
-         '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
+  (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
-       (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
+    '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
-         '("Buffers..." . ediff-merge-buffers))
+  (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
-       (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
+    '("Files..." . ediff-merge-files))
-         '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
-       (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
+  ;; define epatch menu
-         '("Files..." . ediff-merge-files))
+  (define-key menu-bar-epatch-menu [ediff-patch-buffer]
+    '("To a Buffer..." . ediff-patch-buffer))
-       ;; define epatch menu
+  (define-key menu-bar-epatch-menu [ediff-patch-file]
-       (define-key menu-bar-epatch-menu [ediff-patch-buffer]
+    '("To a File..." . ediff-patch-file))
-         '("To a Buffer..." . ediff-patch-buffer))
-       (define-key menu-bar-epatch-menu [ediff-patch-file]
+  ;; define ediff miscellanea
-         '("To a File..." . ediff-patch-file))
+  (define-key menu-bar-ediff-misc-menu [emultiframe]
+    '("Toggle use of separate control buffer frame"
-       ;; define ediff miscellanea
+      . ediff-toggle-multiframe))
-       (define-key menu-bar-ediff-misc-menu [emultiframe]
+  (define-key menu-bar-ediff-misc-menu [eregistry]
-         '("Toggle use of separate control buffer frame"
+    '("List Ediff Sessions" . ediff-show-registry))
-           . ediff-toggle-multiframe))
+  (define-key menu-bar-ediff-misc-menu [ediff-cust]
-       (define-key menu-bar-ediff-misc-menu [eregistry]
+    '("Customize Ediff" . ediff-customize))
-         '("List Ediff Sessions" . ediff-show-registry))
+  (define-key menu-bar-ediff-misc-menu [ediff-doc]
-       (define-key menu-bar-ediff-misc-menu [ediff-cust]
+    '("Ediff Manual" . ediff-documentation)))
-         '("Customize Ediff" . ediff-customize))
-       (define-key menu-bar-ediff-misc-menu [ediff-doc]
-         '("Ediff Manual" . ediff-documentation))
-      ) ; emacs case
- ) ; ediff-cond-compile-for-xemacs-or-emacs
 ;; arrange for autoloads
 (if purify-flag
author	Glenn Morris	2008-03-05 08:51:06 +0000
committer	Glenn Morris	2008-03-05 08:51:06 +0000
commit	535b216fa3777d3737416ee4fb8bb1f1c5b5757b (patch)
tree	edd8bfc0bdf1a7b6d155a012b6420221dd5cfe5d
parent	be33e2ee0fd4eae50df6ba76cfaeb0b495cf8dc7 (diff)
download	emacs-535b216fa3777d3737416ee4fb8bb1f1c5b5757b.tar.gz emacs-535b216fa3777d3737416ee4fb8bb1f1c5b5757b.zip

diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index c44282f33a1..12d9936c1a9 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el
@@ -45,213 +45,193 @@
45	;; end pacifier	45	;; end pacifier
46		46
47	;; allow menus to be set up without ediff-wind.el being loaded	47	;; allow menus to be set up without ediff-wind.el being loaded
48	;;;###autoload
49	(defvar ediff-window-setup-function)	48	(defvar ediff-window-setup-function)
50		49
51	;; This macro is used to avoid compilation warnings.
52	;; The macro will expand into the form that is appropriate to the
53	;; compiler at hand (emacs or xemacs).
54	;; The autoload, below, is useless in Emacs because ediff-hook.el
55	;; is dumped with emacs, but it is needed in XEmacs
56	;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (featurep 'xemacs) xemacs-form emacs-form))
57
58	(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
59	(if (featurep 'xemacs)
60	xemacs-form emacs-form))
61
62	;; This autoload is useless in Emacs because ediff-hook.el is dumped with	50	;; This autoload is useless in Emacs because ediff-hook.el is dumped with
63	;; emacs, but it is needed in XEmacs	51	;; emacs, but it is needed in XEmacs
64	;;;###autoload	52	;;;###autoload
65	(ediff-cond-compile-for-xemacs-or-emacs	53	(if (featurep 'xemacs)
66	;; xemacs form	54	;; xemacs form
67	(defun ediff-xemacs-init-menus ()	55	(defun ediff-xemacs-init-menus ()
68	(if (featurep 'menubar)	56	(when (featurep 'menubar)
69	(progn	57	(add-submenu
70	(add-submenu	58	'("Tools") ediff-menu "OO-Browser...")
71	'("Tools") ediff-menu "OO-Browser...")	59	(add-submenu
72	(add-submenu	60	'("Tools") ediff-merge-menu "OO-Browser...")
73	'("Tools") ediff-merge-menu "OO-Browser...")	61	(add-submenu
74	(add-submenu	62	'("Tools") epatch-menu "OO-Browser...")
75	'("Tools") epatch-menu "OO-Browser...")	63	(add-submenu
76	(add-submenu	64	'("Tools") ediff-misc-menu "OO-Browser...")
77	'("Tools") ediff-misc-menu "OO-Browser...")	65	(add-menu-button
78	(add-menu-button	66	'("Tools") "-------" "OO-Browser...")
79	'("Tools") "-------" "OO-Browser...")	67	)))
80	)))
81	nil ; emacs form
82	)
83		68
84		69
85	;; This autoload is useless in Emacs because ediff-hook.el is dumped with	70	;; This autoload is useless in Emacs because ediff-hook.el is dumped with
86	;; emacs, but it is needed in XEmacs	71	;; emacs, but it is needed in XEmacs
87	;;;###autoload	72	;;;###autoload
88	(ediff-cond-compile-for-xemacs-or-emacs	73	(if (featurep 'xemacs)
89	(progn	74	(progn
90	(defvar ediff-menu	75	(defvar ediff-menu
91	'("Compare"	76	'("Compare"
92	["Two Files..." ediff-files t]	77	["Two Files..." ediff-files t]
93	["Two Buffers..." ediff-buffers t]	78	["Two Buffers..." ediff-buffers t]
94	["Three Files..." ediff-files3 t]	79	["Three Files..." ediff-files3 t]
95	["Three Buffers..." ediff-buffers3 t]	80	["Three Buffers..." ediff-buffers3 t]
96	"---"	81	"---"
97	["Two Directories..." ediff-directories t]	82	["Two Directories..." ediff-directories t]
98	["Three Directories..." ediff-directories3 t]	83	["Three Directories..." ediff-directories3 t]
99	"---"	84	"---"
100	["File with Revision..." ediff-revision t]	85	["File with Revision..." ediff-revision t]
101	["Directory Revisions..." ediff-directory-revisions t]	86	["Directory Revisions..." ediff-directory-revisions t]
102	"---"	87	"---"
103	["Windows Word-by-word..." ediff-windows-wordwise t]	88	["Windows Word-by-word..." ediff-windows-wordwise t]
104	["Windows Line-by-line..." ediff-windows-linewise t]	89	["Windows Line-by-line..." ediff-windows-linewise t]
105	"---"	90	"---"
106	["Regions Word-by-word..." ediff-regions-wordwise t]	91	["Regions Word-by-word..." ediff-regions-wordwise t]
107	["Regions Line-by-line..." ediff-regions-linewise t]	92	["Regions Line-by-line..." ediff-regions-linewise t]
108	))	93	))
109	(defvar ediff-merge-menu	94	(defvar ediff-merge-menu
110	'("Merge"	95	'("Merge"
111	["Files..." ediff-merge-files t]	96	["Files..." ediff-merge-files t]
112	["Files with Ancestor..." ediff-merge-files-with-ancestor t]	97	["Files with Ancestor..." ediff-merge-files-with-ancestor t]
113	["Buffers..." ediff-merge-buffers t]	98	["Buffers..." ediff-merge-buffers t]
114	["Buffers with Ancestor..."	99	["Buffers with Ancestor..."
115	ediff-merge-buffers-with-ancestor t]	100	ediff-merge-buffers-with-ancestor t]
116	"---"	101	"---"
117	["Directories..." ediff-merge-directories t]	102	["Directories..." ediff-merge-directories t]
118	["Directories with Ancestor..."	103	["Directories with Ancestor..."
119	ediff-merge-directories-with-ancestor t]	104	ediff-merge-directories-with-ancestor t]
120	"---"	105	"---"
121	["Revisions..." ediff-merge-revisions t]	106	["Revisions..." ediff-merge-revisions t]
122	["Revisions with Ancestor..."	107	["Revisions with Ancestor..."
123	ediff-merge-revisions-with-ancestor t]	108	ediff-merge-revisions-with-ancestor t]
124	["Directory Revisions..." ediff-merge-directory-revisions t]	109	["Directory Revisions..." ediff-merge-directory-revisions t]
125	["Directory Revisions with Ancestor..."	110	["Directory Revisions with Ancestor..."
126	ediff-merge-directory-revisions-with-ancestor t]	111	ediff-merge-directory-revisions-with-ancestor t]
127	))	112	))
128	(defvar epatch-menu	113	(defvar epatch-menu
129	'("Apply Patch"	114	'("Apply Patch"
130	["To a file..." ediff-patch-file t]	115	["To a file..." ediff-patch-file t]
131	["To a buffer..." ediff-patch-buffer t]	116	["To a buffer..." ediff-patch-buffer t]
132	))	117	))
133	(defvar ediff-misc-menu	118	(defvar ediff-misc-menu
134	'("Ediff Miscellanea"	119	'("Ediff Miscellanea"
135	["Ediff Manual" ediff-documentation t]	120	["Ediff Manual" ediff-documentation t]
136	["Customize Ediff" ediff-customize t]	121	["Customize Ediff" ediff-customize t]
137	["List Ediff Sessions" ediff-show-registry t]	122	["List Ediff Sessions" ediff-show-registry t]
138	["Use separate frame for Ediff control buffer"	123	["Use separate frame for Ediff control buffer"
139	ediff-toggle-multiframe	124	ediff-toggle-multiframe
140	:style toggle	125	:style toggle
141	:selected (if (and (featurep 'ediff-util)	126	:selected (if (and (featurep 'ediff-util)
142	(boundp 'ediff-window-setup-function))	127	(boundp 'ediff-window-setup-function))
143	(eq ediff-window-setup-function	128	(eq ediff-window-setup-function
144	'ediff-setup-windows-multiframe))]	129	'ediff-setup-windows-multiframe))]
145	["Use a toolbar with Ediff control buffer"	130	["Use a toolbar with Ediff control buffer"
146	ediff-toggle-use-toolbar	131	ediff-toggle-use-toolbar
147	:style toggle	132	:style toggle
148	:selected (if (featurep 'ediff-tbar)	133	:selected (if (featurep 'ediff-tbar)
149	(ediff-use-toolbar-p))]	134	(ediff-use-toolbar-p))]))
150	))	135
151		136	;; put these menus before Object-Oriented-Browser in Tools menu
152	;; put these menus before Object-Oriented-Browser in Tools menu	137	(if (and (featurep 'menubar) (not (featurep 'infodock))
153	(if (and (featurep 'menubar) (not (featurep 'infodock))	138	(not (featurep 'ediff-hook)))
154	(not (featurep 'ediff-hook)))	139	(ediff-xemacs-init-menus)))
155	(ediff-xemacs-init-menus)))	140	;; Emacs
156		141	;; initialize menu bar keymaps
157	;; Emacs	142	(defvar menu-bar-ediff-misc-menu
158	(progn	143	(make-sparse-keymap "Ediff Miscellanea"))
159	;; initialize menu bar keymaps	144	(fset 'menu-bar-ediff-misc-menu
160	(defvar menu-bar-ediff-misc-menu	145	(symbol-value 'menu-bar-ediff-misc-menu))
161	(make-sparse-keymap "Ediff Miscellanea"))	146	(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
162	(fset 'menu-bar-ediff-misc-menu	147	(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
163	(symbol-value 'menu-bar-ediff-misc-menu))	148	(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
164	(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))	149	(fset 'menu-bar-ediff-merge-menu
165	(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))	150	(symbol-value 'menu-bar-ediff-merge-menu))
166	(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))	151	(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
167	(fset 'menu-bar-ediff-merge-menu	152	(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
168	(symbol-value 'menu-bar-ediff-merge-menu))	153
169	(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))	154	;; define ediff-menu
170	(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))	155	(define-key menu-bar-ediff-menu [window]
171		156	'("This Window and Next Window" . compare-windows))
172	;; define ediff-menu	157	(define-key menu-bar-ediff-menu [ediff-windows-linewise]
173	(define-key menu-bar-ediff-menu [window]	158	'("Windows Line-by-line..." . ediff-windows-linewise))
174	'("This Window and Next Window" . compare-windows))	159	(define-key menu-bar-ediff-menu [ediff-windows-wordwise]
175	(define-key menu-bar-ediff-menu [ediff-windows-linewise]	160	'("Windows Word-by-word..." . ediff-windows-wordwise))
176	'("Windows Line-by-line..." . ediff-windows-linewise))	161	(define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
177	(define-key menu-bar-ediff-menu [ediff-windows-wordwise]	162	(define-key menu-bar-ediff-menu [ediff-regions-linewise]
178	'("Windows Word-by-word..." . ediff-windows-wordwise))	163	'("Regions Line-by-line..." . ediff-regions-linewise))
179	(define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))	164	(define-key menu-bar-ediff-menu [ediff-regions-wordwise]
180	(define-key menu-bar-ediff-menu [ediff-regions-linewise]	165	'("Regions Word-by-word..." . ediff-regions-wordwise))
181	'("Regions Line-by-line..." . ediff-regions-linewise))	166	(define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
182	(define-key menu-bar-ediff-menu [ediff-regions-wordwise]	167	(define-key menu-bar-ediff-menu [ediff-dir-revision]
183	'("Regions Word-by-word..." . ediff-regions-wordwise))	168	'("Directory Revisions..." . ediff-directory-revisions))
184	(define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))	169	(define-key menu-bar-ediff-menu [ediff-revision]
185	(define-key menu-bar-ediff-menu [ediff-dir-revision]	170	'("File with Revision..." . ediff-revision))
186	'("Directory Revisions..." . ediff-directory-revisions))	171	(define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
187	(define-key menu-bar-ediff-menu [ediff-revision]	172	(define-key menu-bar-ediff-menu [ediff-directories3]
188	'("File with Revision..." . ediff-revision))	173	'("Three Directories..." . ediff-directories3))
189	(define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))	174	(define-key menu-bar-ediff-menu [ediff-directories]
190	(define-key menu-bar-ediff-menu [ediff-directories3]	175	'("Two Directories..." . ediff-directories))
191	'("Three Directories..." . ediff-directories3))	176	(define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
192	(define-key menu-bar-ediff-menu [ediff-directories]	177	(define-key menu-bar-ediff-menu [ediff-buffers3]
193	'("Two Directories..." . ediff-directories))	178	'("Three Buffers..." . ediff-buffers3))
194	(define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))	179	(define-key menu-bar-ediff-menu [ediff-files3]
195	(define-key menu-bar-ediff-menu [ediff-buffers3]	180	'("Three Files..." . ediff-files3))
196	'("Three Buffers..." . ediff-buffers3))	181	(define-key menu-bar-ediff-menu [ediff-buffers]
197	(define-key menu-bar-ediff-menu [ediff-files3]	182	'("Two Buffers..." . ediff-buffers))
198	'("Three Files..." . ediff-files3))	183	(define-key menu-bar-ediff-menu [ediff-files]
199	(define-key menu-bar-ediff-menu [ediff-buffers]	184	'("Two Files..." . ediff-files))
200	'("Two Buffers..." . ediff-buffers))	185
201	(define-key menu-bar-ediff-menu [ediff-files]	186	;; define merge menu
202	'("Two Files..." . ediff-files))	187	(define-key
203		188	menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
204	;; define merge menu	189	'("Directory Revisions with Ancestor..."
205	(define-key	190	. ediff-merge-directory-revisions-with-ancestor))
206	menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]	191	(define-key
207	'("Directory Revisions with Ancestor..."	192	menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
208	. ediff-merge-directory-revisions-with-ancestor))	193	'("Directory Revisions..." . ediff-merge-directory-revisions))
209	(define-key	194	(define-key
210	menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]	195	menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
211	'("Directory Revisions..." . ediff-merge-directory-revisions))	196	'("Revisions with Ancestor..."
212	(define-key	197	. ediff-merge-revisions-with-ancestor))
213	menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]	198	(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
214	'("Revisions with Ancestor..."	199	'("Revisions..." . ediff-merge-revisions))
215	. ediff-merge-revisions-with-ancestor))	200	(define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
216	(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]	201	(define-key
217	'("Revisions..." . ediff-merge-revisions))	202	menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
218	(define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))	203	'("Directories with Ancestor..."
219	(define-key	204	. ediff-merge-directories-with-ancestor))
220	menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]	205	(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
221	'("Directories with Ancestor..."	206	'("Directories..." . ediff-merge-directories))
222	. ediff-merge-directories-with-ancestor))	207	(define-key
223	(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]	208	menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
224	'("Directories..." . ediff-merge-directories))	209	(define-key
225	(define-key	210	menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
226	menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))	211	'("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
227	(define-key	212	(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
228	menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]	213	'("Buffers..." . ediff-merge-buffers))
229	'("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))	214	(define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
230	(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]	215	'("Files with Ancestor..." . ediff-merge-files-with-ancestor))
231	'("Buffers..." . ediff-merge-buffers))	216	(define-key menu-bar-ediff-merge-menu [ediff-merge-files]
232	(define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]	217	'("Files..." . ediff-merge-files))
233	'("Files with Ancestor..." . ediff-merge-files-with-ancestor))	218
234	(define-key menu-bar-ediff-merge-menu [ediff-merge-files]	219	;; define epatch menu
235	'("Files..." . ediff-merge-files))	220	(define-key menu-bar-epatch-menu [ediff-patch-buffer]
236		221	'("To a Buffer..." . ediff-patch-buffer))
237	;; define epatch menu	222	(define-key menu-bar-epatch-menu [ediff-patch-file]
238	(define-key menu-bar-epatch-menu [ediff-patch-buffer]	223	'("To a File..." . ediff-patch-file))
239	'("To a Buffer..." . ediff-patch-buffer))	224
240	(define-key menu-bar-epatch-menu [ediff-patch-file]	225	;; define ediff miscellanea
241	'("To a File..." . ediff-patch-file))	226	(define-key menu-bar-ediff-misc-menu [emultiframe]
242		227	'("Toggle use of separate control buffer frame"
243	;; define ediff miscellanea	228	. ediff-toggle-multiframe))
244	(define-key menu-bar-ediff-misc-menu [emultiframe]	229	(define-key menu-bar-ediff-misc-menu [eregistry]
245	'("Toggle use of separate control buffer frame"	230	'("List Ediff Sessions" . ediff-show-registry))
246	. ediff-toggle-multiframe))	231	(define-key menu-bar-ediff-misc-menu [ediff-cust]
247	(define-key menu-bar-ediff-misc-menu [eregistry]	232	'("Customize Ediff" . ediff-customize))
248	'("List Ediff Sessions" . ediff-show-registry))	233	(define-key menu-bar-ediff-misc-menu [ediff-doc]
249	(define-key menu-bar-ediff-misc-menu [ediff-cust]	234	'("Ediff Manual" . ediff-documentation)))
250	'("Customize Ediff" . ediff-customize))
251	(define-key menu-bar-ediff-misc-menu [ediff-doc]
252	'("Ediff Manual" . ediff-documentation))
253	) ; emacs case
254	) ; ediff-cond-compile-for-xemacs-or-emacs
255		235
256	;; arrange for autoloads	236	;; arrange for autoloads
257	(if purify-flag	237	(if purify-flag