Add arch taglines
[bpt/emacs.git] / lisp / ediff-hook.el
CommitLineData
fa2eb9ac 1;;; ediff-hook.el --- setup for Ediff's menus and autoloads
b578f267 2
50a07e18 3;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
fa2eb9ac 4
50a07e18 5;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
fa2eb9ac
MK
6
7;; This file is part of GNU Emacs.
8
9;; GNU Emacs is free software; you can redistribute it and/or modify
10;; it under the terms of the GNU General Public License as published by
11;; the Free Software Foundation; either version 2, or (at your option)
12;; any later version.
13
14;; GNU Emacs is distributed in the hope that it will be useful,
15;; but WITHOUT ANY WARRANTY; without even the implied warranty of
16;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17;; GNU General Public License for more details.
18
19;; You should have received a copy of the GNU General Public License
b578f267
EN
20;; along with GNU Emacs; see the file COPYING. If not, write to the
21;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22;; Boston, MA 02111-1307, USA.
fa2eb9ac 23
3afbc435
PJ
24;;; Commentary:
25
b578f267 26;;; Code:
fa2eb9ac 27
4ae69eac 28;;; These must be placed in menu-bar.el in Emacs
fa2eb9ac 29;;
ddc90f39
MK
30;; (define-key menu-bar-tools-menu [ediff-misc]
31;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu))
fa2eb9ac
MK
32;; (define-key menu-bar-tools-menu [epatch]
33;; '("Apply Patch" . menu-bar-epatch-menu))
34;; (define-key menu-bar-tools-menu [ediff-merge]
35;; '("Merge" . menu-bar-ediff-merge-menu))
36;; (define-key menu-bar-tools-menu [ediff]
37;; '("Compare" . menu-bar-ediff-menu))
38
bbe6126c
MK
39;; Compiler pacifier
40(defvar ediff-menu)
41(defvar ediff-merge-menu)
42(defvar epatch-menu)
ddc90f39 43(defvar ediff-misc-menu)
bbe6126c 44;; end pacifier
fa2eb9ac 45
ddc90f39 46;; allow menus to be set up without ediff-wind.el being loaded
f3eabcdf 47;;;###autoload
ddc90f39 48(defvar ediff-window-setup-function)
50a07e18 49
abdb213c
MK
50;; This macro is used to avoid compilation warnings.
51;; The macro will expand into the form that is appropriate to the
52;; compiler at hand (emacs or xemacs).
53;; The autoload, below, is useless in Emacs because ediff-hook.el
54;; is dumped with emacs, but it is needed in XEmacs
a6b194ca
RS
55;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form))
56
50a07e18
MK
57(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
58 (if (string-match "XEmacs" emacs-version)
59 xemacs-form emacs-form))
71296446 60
abdb213c
MK
61;; This autoload is useless in Emacs because ediff-hook.el is dumped with
62;; emacs, but it is needed in XEmacs
f3eabcdf 63;;;###autoload
abdb213c
MK
64(ediff-cond-compile-for-xemacs-or-emacs
65 ;; xemacs form
66 (defun ediff-xemacs-init-menus ()
67 (if (featurep 'menubar)
68 (progn
69 (add-submenu
70 '("Tools") ediff-menu "OO-Browser...")
71 (add-submenu
72 '("Tools") ediff-merge-menu "OO-Browser...")
73 (add-submenu
74 '("Tools") epatch-menu "OO-Browser...")
75 (add-submenu
76 '("Tools") ediff-misc-menu "OO-Browser...")
77 (add-menu-button
78 '("Tools") "-------" "OO-Browser...")
79 )))
80 nil ; emacs form
81 )
50a07e18
MK
82
83
abdb213c
MK
84;; This autoload is useless in Emacs because ediff-hook.el is dumped with
85;; emacs, but it is needed in XEmacs
f3eabcdf 86;;;###autoload
50a07e18
MK
87(ediff-cond-compile-for-xemacs-or-emacs
88 (progn
89 (defvar ediff-menu
90 '("Compare"
91 ["Two Files..." ediff-files t]
92 ["Two Buffers..." ediff-buffers t]
93 ["Three Files..." ediff-files3 t]
94 ["Three Buffers..." ediff-buffers3 t]
95 "---"
96 ["Two Directories..." ediff-directories t]
97 ["Three Directories..." ediff-directories3 t]
98 "---"
99 ["File with Revision..." ediff-revision t]
100 ["Directory Revisions..." ediff-directory-revisions t]
101 "---"
102 ["Windows Word-by-word..." ediff-windows-wordwise t]
103 ["Windows Line-by-line..." ediff-windows-linewise t]
104 "---"
105 ["Regions Word-by-word..." ediff-regions-wordwise t]
106 ["Regions Line-by-line..." ediff-regions-linewise t]
107 ))
108 (defvar ediff-merge-menu
109 '("Merge"
110 ["Files..." ediff-merge-files t]
111 ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
112 ["Buffers..." ediff-merge-buffers t]
113 ["Buffers with Ancestor..."
114 ediff-merge-buffers-with-ancestor t]
115 "---"
116 ["Directories..." ediff-merge-directories t]
117 ["Directories with Ancestor..."
118 ediff-merge-directories-with-ancestor t]
119 "---"
120 ["Revisions..." ediff-merge-revisions t]
121 ["Revisions with Ancestor..."
122 ediff-merge-revisions-with-ancestor t]
123 ["Directory Revisions..." ediff-merge-directory-revisions t]
124 ["Directory Revisions with Ancestor..."
125 ediff-merge-directory-revisions-with-ancestor t]
126 ))
127 (defvar epatch-menu
128 '("Apply Patch"
129 ["To a file..." ediff-patch-file t]
130 ["To a buffer..." ediff-patch-buffer t]
131 ))
132 (defvar ediff-misc-menu
133 '("Ediff Miscellanea"
134 ["Ediff Manual..." ediff-documentation t]
135 ["Customize Ediff..." ediff-customize t]
136 ["List Ediff Sessions..." ediff-show-registry t]
137 ["Use separate frame for Ediff control buffer..."
138 ediff-toggle-multiframe
139 :style toggle
140 :selected (if (and (featurep 'ediff-util)
141 (boundp 'ediff-window-setup-function))
142 (eq ediff-window-setup-function
143 'ediff-setup-windows-multiframe))]
144 ["Use a toolbar with Ediff control buffer"
145 ediff-toggle-use-toolbar
146 :style toggle
147 :selected (if (featurep 'ediff-tbar)
148 (ediff-use-toolbar-p))]
149 ))
71296446 150
50a07e18
MK
151 ;; put these menus before Object-Oriented-Browser in Tools menu
152 (if (and (featurep 'menubar) (not (featurep 'infodock))
153 (not (featurep 'ediff-hook)))
3af0304a 154 (ediff-xemacs-init-menus)))
71296446 155
50a07e18
MK
156 ;; Emacs--only if menu-bar is loaded
157 (if (featurep 'menu-bar)
158 (progn
fa2eb9ac 159 ;; initialize menu bar keymaps
ddc90f39
MK
160 (defvar menu-bar-ediff-misc-menu
161 (make-sparse-keymap "Ediff Miscellanea"))
162 (fset 'menu-bar-ediff-misc-menu
163 (symbol-value 'menu-bar-ediff-misc-menu))
8a10f781 164 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
fa2eb9ac 165 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
8a10f781 166 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
71296446 167 (fset 'menu-bar-ediff-merge-menu
fa2eb9ac 168 (symbol-value 'menu-bar-ediff-merge-menu))
8a10f781 169 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
fa2eb9ac
MK
170 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
171
172 ;; define ediff-menu
f9b2678c 173 (define-key menu-bar-ediff-menu [window]
4ae69eac
MK
174 '("This Window and Next Window" . compare-windows))
175 (define-key menu-bar-ediff-menu [ediff-windows-linewise]
176 '("Windows Line-by-line..." . ediff-windows-linewise))
177 (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
178 '("Windows Word-by-word..." . ediff-windows-wordwise))
179 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
180 (define-key menu-bar-ediff-menu [ediff-regions-linewise]
181 '("Regions Line-by-line..." . ediff-regions-linewise))
182 (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
183 '("Regions Word-by-word..." . ediff-regions-wordwise))
184 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
fa2eb9ac 185 (define-key menu-bar-ediff-menu [ediff-dir-revision]
190271b9 186 '("Directory Revisions..." . ediff-directory-revisions))
fa2eb9ac 187 (define-key menu-bar-ediff-menu [ediff-revision]
190271b9 188 '("File with Revision..." . ediff-revision))
fa2eb9ac
MK
189 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
190 (define-key menu-bar-ediff-menu [ediff-directories3]
190271b9 191 '("Three Directories..." . ediff-directories3))
fa2eb9ac 192 (define-key menu-bar-ediff-menu [ediff-directories]
190271b9 193 '("Two Directories..." . ediff-directories))
fa2eb9ac
MK
194 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
195 (define-key menu-bar-ediff-menu [ediff-buffers3]
190271b9 196 '("Three Buffers..." . ediff-buffers3))
fa2eb9ac 197 (define-key menu-bar-ediff-menu [ediff-files3]
190271b9 198 '("Three Files..." . ediff-files3))
fa2eb9ac 199 (define-key menu-bar-ediff-menu [ediff-buffers]
190271b9 200 '("Two Buffers..." . ediff-buffers))
fa2eb9ac 201 (define-key menu-bar-ediff-menu [ediff-files]
190271b9 202 '("Two Files..." . ediff-files))
fa2eb9ac
MK
203
204 ;; define merge menu
205 (define-key
206 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
190271b9 207 '("Directory Revisions with Ancestor..."
fa2eb9ac
MK
208 . ediff-merge-directory-revisions-with-ancestor))
209 (define-key
210 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
190271b9 211 '("Directory Revisions..." . ediff-merge-directory-revisions))
fa2eb9ac
MK
212 (define-key
213 menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
190271b9 214 '("Revisions with Ancestor..."
fa2eb9ac
MK
215 . ediff-merge-revisions-with-ancestor))
216 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
190271b9 217 '("Revisions..." . ediff-merge-revisions))
fa2eb9ac
MK
218 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
219 (define-key
220 menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
190271b9 221 '("Directories with Ancestor..."
fa2eb9ac
MK
222 . ediff-merge-directories-with-ancestor))
223 (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
190271b9 224 '("Directories..." . ediff-merge-directories))
71296446 225 (define-key
fa2eb9ac
MK
226 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
227 (define-key
228 menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
190271b9 229 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
fa2eb9ac 230 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
190271b9 231 '("Buffers..." . ediff-merge-buffers))
fa2eb9ac 232 (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
190271b9 233 '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
fa2eb9ac 234 (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
190271b9 235 '("Files..." . ediff-merge-files))
fa2eb9ac
MK
236
237 ;; define epatch menu
238 (define-key menu-bar-epatch-menu [ediff-patch-buffer]
190271b9 239 '("To a Buffer..." . ediff-patch-buffer))
fa2eb9ac 240 (define-key menu-bar-epatch-menu [ediff-patch-file]
ddc90f39
MK
241 '("To a File..." . ediff-patch-file))
242
243 ;; define ediff miscellanea
244 (define-key menu-bar-ediff-misc-menu [emultiframe]
245 '("Toggle use of separate control buffer frame..."
246 . ediff-toggle-multiframe))
247 (define-key menu-bar-ediff-misc-menu [eregistry]
248 '("List Ediff Sessions..." . ediff-show-registry))
3af0304a
MK
249 (define-key menu-bar-ediff-misc-menu [ediff-cust]
250 '("Customize Ediff..." . ediff-customize))
ddc90f39
MK
251 (define-key menu-bar-ediff-misc-menu [ediff-doc]
252 '("Ediff Manual..." . ediff-documentation))
253 )
71296446 254
50a07e18
MK
255 ) ; emacs case
256 ) ; ediff-cond-compile-for-xemacs-or-emacs
fa2eb9ac 257
f9b2678c 258;; arrange for autoloads
fa2eb9ac
MK
259(if purify-flag
260 () ; if dumping, autoloads are set up in loaddefs.el
261 ;; if the user decides to load this file, set up autoloads
262 ;; compare files and buffers
263 (autoload 'ediff "ediff" "Compare two files" t)
264 (autoload 'ediff-files "ediff" "Compare two files" t)
265 (autoload 'ediff-buffers "ediff" "Compare two bufers" t)
bbe6126c 266 (autoload 'ebuffers "ediff" "Compare two bufers" t)
fa2eb9ac
MK
267 (autoload 'ediff3 "ediff" "Compare three files" t)
268 (autoload 'ediff-files3 "ediff" "Compare three files" t)
269 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
bbe6126c 270 (autoload 'ebuffers3 "ediff" "Compare three bufers" t)
fa2eb9ac 271
1e70790f 272 (autoload 'erevision "ediff" "Compare versions of a file" t)
fa2eb9ac
MK
273 (autoload 'ediff-revision "ediff" "Compare versions of a file" t)
274
275 ;; compare regions and windows
71296446 276 (autoload 'ediff-windows-wordwise
bbe6126c 277 "ediff" "Compare two windows word-by-word." t)
71296446 278 (autoload 'ediff-regions-wordwise
bbe6126c 279 "ediff" "Compare two regions word-by-word." t)
71296446 280 (autoload 'ediff-windows-linewise
bbe6126c 281 "ediff" "Compare two windows line-by-line." t)
71296446 282 (autoload 'ediff-regions-linewise
bbe6126c 283 "ediff" "Compare two regions line-by-line." t)
fa2eb9ac
MK
284
285 ;; patch
bbe6126c
MK
286 (autoload 'ediff-patch-file "ediff" "Patch a file." t)
287 (autoload 'epatch "ediff" "Patch a file." t)
288 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.")
289 (autoload 'epatch-buffer "ediff" "Patch a buffer." t)
fa2eb9ac
MK
290
291 ;; merge
bbe6126c
MK
292 (autoload 'ediff-merge "ediff" "Merge two files." t)
293 (autoload 'ediff-merge-files "ediff" "Merge two files." t)
fa2eb9ac 294 (autoload 'ediff-merge-files-with-ancestor
bbe6126c
MK
295 "ediff" "Merge two files using a third file as an ancestor." t)
296 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t)
fa2eb9ac 297 (autoload 'ediff-merge-buffers-with-ancestor
bbe6126c 298 "ediff" "Merge two buffers using a third buffer as an ancestor." t)
fa2eb9ac 299
bbe6126c 300 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t)
fa2eb9ac 301 (autoload 'ediff-merge-revisions-with-ancestor
bbe6126c 302 "ediff" "Merge two versions of a file." t)
fa2eb9ac
MK
303
304 ;; compare directories
bbe6126c
MK
305 (autoload 'edirs "ediff" "Compare files in two directories." t)
306 (autoload 'ediff-directories "ediff" "Compare files in two directories." t)
307 (autoload 'edirs3 "ediff" "Compare files in three directories." t)
308 (autoload
309 'ediff-directories3 "ediff" "Compare files in three directories." t)
fa2eb9ac 310
71296446 311 (autoload 'edir-revisions
bbe6126c 312 "ediff" "Compare two versions of a file." t)
71296446 313 (autoload 'ediff-directory-revisions
bbe6126c 314 "ediff" "Compare two versions of a file." t)
fa2eb9ac
MK
315
316 ;; merge directories
bbe6126c 317 (autoload 'edirs-merge "ediff" "Merge files in two directories." t)
fa2eb9ac 318 (autoload 'ediff-merge-directories
bbe6126c 319 "ediff" "Merge files in two directories." t)
fa2eb9ac
MK
320 (autoload 'edirs-merge-with-ancestor
321 "ediff"
bbe6126c
MK
322 "Merge files in two directories using files in a third dir as ancestors."
323 t)
fa2eb9ac
MK
324 (autoload 'ediff-merge-directories-with-ancestor
325 "ediff"
bbe6126c
MK
326 "Merge files in two directories using files in a third dir as ancestors."
327 t)
fa2eb9ac 328
71296446 329 (autoload 'edir-merge-revisions
bbe6126c 330 "ediff" "Merge versions of files in a directory." t)
71296446 331 (autoload 'ediff-merge-directory-revisions
bbe6126c 332 "ediff" "Merge versions of files in a directory." t)
fa2eb9ac
MK
333 (autoload 'ediff-merge-directory-revisions-with-ancestor
334 "ediff"
bbe6126c 335 "Merge versions of files in a directory using other versions as ancestors."
fa2eb9ac
MK
336 t)
337 (autoload 'edir-merge-revisions-with-ancestor
338 "ediff"
bbe6126c 339 "Merge versions of files in a directory using other versions as ancestors."
fa2eb9ac 340 t)
f9b2678c
MK
341
342 ;; misc
fa2eb9ac 343 (autoload 'ediff-show-registry
92c51e07 344 "ediff-mult"
bbe6126c
MK
345 "Display the registry of active Ediff sessions."
346 t)
1e70790f
MK
347 (autoload 'eregistry
348 "ediff-mult"
349 "Display the registry of active Ediff sessions."
350 t)
bbe6126c
MK
351 (autoload 'ediff-documentation
352 "ediff"
353 "Display Ediff's manual."
fa2eb9ac 354 t)
f9b2678c
MK
355 (autoload 'ediff-version
356 "ediff"
bbe6126c 357 "Show Ediff's version and last modification date."
f9b2678c 358 t)
bf5d92c5
MK
359 (autoload 'ediff-toggle-multiframe
360 "ediff-util"
361 "Toggle the use of separate frame for Ediff control buffer."
362 t)
ddc90f39
MK
363 (autoload 'ediff-toggle-use-toolbar
364 "ediff-util"
365 "Toggle the use of Ediff toolbar."
366 t)
71296446 367
fa2eb9ac
MK
368 ) ; if purify-flag
369
370
371(provide 'ediff-hook)
372
ab5796a9 373;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
fa2eb9ac 374;;; ediff-hook.el ends here