Commit | Line | Data |
---|---|---|
fa2eb9ac | 1 | ;;; ediff-hook.el --- setup for Ediff's menus and autoloads |
b578f267 | 2 | |
ddc90f39 | 3 | ;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. |
fa2eb9ac MK |
4 | |
5 | ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
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 |
3af0304a | 47 | ;;;###autoload |
ddc90f39 | 48 | (defvar ediff-window-setup-function) |
3af0304a MK |
49 | |
50 | ;; Note we wrap this in a progn so that we pick up the whole def | |
51 | ;; for auto-autoload. That way we do not load ediff-hook.el when defining | |
52 | ;; the menus. | |
53 | ;;;###autoload | |
54 | (progn | |
55 | (defun ediff-xemacs-init-menus () | |
56 | (if (featurep 'menubar) | |
57 | (progn | |
58 | (add-submenu | |
59 | '("Tools") ediff-menu "OO-Browser...") | |
60 | (add-submenu | |
61 | '("Tools") ediff-merge-menu "OO-Browser...") | |
62 | (add-submenu | |
63 | '("Tools") epatch-menu "OO-Browser...") | |
64 | (add-submenu | |
65 | '("Tools") ediff-misc-menu "OO-Browser...") | |
66 | (add-menu-button | |
2550055a | 67 | '("Tools") "-------" "OO-Browser...") |
3af0304a | 68 | )))) |
fa2eb9ac MK |
69 | |
70 | ||
fa2eb9ac | 71 | ;; explicit string-match is needed: ediff-xemacs-p is not defined at build time |
3af0304a | 72 | ;;;###autoload |
fa2eb9ac MK |
73 | (cond ((string-match "XEmacs" emacs-version) |
74 | (defvar ediff-menu | |
75 | '("Compare" | |
190271b9 KH |
76 | ["Two Files..." ediff-files t] |
77 | ["Two Buffers..." ediff-buffers t] | |
78 | ["Three Files..." ediff-files3 t] | |
79 | ["Three Buffers..." ediff-buffers3 t] | |
fa2eb9ac | 80 | "---" |
190271b9 KH |
81 | ["Two Directories..." ediff-directories t] |
82 | ["Three Directories..." ediff-directories3 t] | |
fa2eb9ac | 83 | "---" |
190271b9 KH |
84 | ["File with Revision..." ediff-revision t] |
85 | ["Directory Revisions..." ediff-directory-revisions t] | |
fa2eb9ac | 86 | "---" |
190271b9 KH |
87 | ["Windows Word-by-word..." ediff-windows-wordwise t] |
88 | ["Windows Line-by-line..." ediff-windows-linewise t] | |
fa2eb9ac | 89 | "---" |
190271b9 | 90 | ["Regions Word-by-word..." ediff-regions-wordwise t] |
4ae69eac MK |
91 | ["Regions Line-by-line..." ediff-regions-linewise t] |
92 | )) | |
fa2eb9ac MK |
93 | (defvar ediff-merge-menu |
94 | '("Merge" | |
190271b9 KH |
95 | ["Files..." ediff-merge-files t] |
96 | ["Files with Ancestor..." ediff-merge-files-with-ancestor t] | |
97 | ["Buffers..." ediff-merge-buffers t] | |
98 | ["Buffers with Ancestor..." | |
fa2eb9ac MK |
99 | ediff-merge-buffers-with-ancestor t] |
100 | "---" | |
190271b9 KH |
101 | ["Directories..." ediff-merge-directories t] |
102 | ["Directories with Ancestor..." | |
fa2eb9ac MK |
103 | ediff-merge-directories-with-ancestor t] |
104 | "---" | |
190271b9 KH |
105 | ["Revisions..." ediff-merge-revisions t] |
106 | ["Revisions with Ancestor..." | |
fa2eb9ac | 107 | ediff-merge-revisions-with-ancestor t] |
190271b9 KH |
108 | ["Directory Revisions..." ediff-merge-directory-revisions t] |
109 | ["Directory Revisions with Ancestor..." | |
4ae69eac MK |
110 | ediff-merge-directory-revisions-with-ancestor t] |
111 | )) | |
fa2eb9ac MK |
112 | (defvar epatch-menu |
113 | '("Apply Patch" | |
190271b9 | 114 | ["To a file..." ediff-patch-file t] |
4ae69eac | 115 | ["To a buffer..." ediff-patch-buffer t] |
ddc90f39 MK |
116 | )) |
117 | (defvar ediff-misc-menu | |
118 | '("Ediff Miscellanea" | |
bbe6126c | 119 | ["Ediff Manual..." ediff-documentation t] |
3af0304a | 120 | ["Customize Ediff..." ediff-customize t] |
ddc90f39 MK |
121 | ["List Ediff Sessions..." ediff-show-registry t] |
122 | ["Use separate frame for Ediff control buffer..." | |
123 | ediff-toggle-multiframe | |
124 | :style toggle | |
125 | :selected (if (and (featurep 'ediff-util) | |
126 | (boundp 'ediff-window-setup-function)) | |
127 | (eq ediff-window-setup-function | |
128 | 'ediff-setup-windows-multiframe))] | |
129 | ["Use a toolbar with Ediff control buffer" | |
130 | ediff-toggle-use-toolbar | |
131 | :style toggle | |
132 | :selected (if (featurep 'ediff-tbar) | |
133 | (ediff-use-toolbar-p))] | |
4ae69eac | 134 | )) |
3af0304a | 135 | |
fa2eb9ac | 136 | ;; put these menus before Object-Oriented-Browser in Tools menu |
3af0304a MK |
137 | ;;; (add-hook 'before-init-hook 'ediff-xemacs-init-menus) |
138 | ;;; (if (not purify-flag) | |
139 | ;;; (ediff-xemacs-init-menus)) | |
140 | ;;; ) | |
141 | (if (and (featurep 'menubar) (not (featurep 'infodock)) | |
142 | (not (featurep 'ediff-hook))) | |
143 | (ediff-xemacs-init-menus))) | |
fa2eb9ac MK |
144 | |
145 | ;; Emacs--only if menu-bar is loaded | |
146 | ((featurep 'menu-bar) | |
147 | ;; initialize menu bar keymaps | |
ddc90f39 MK |
148 | (defvar menu-bar-ediff-misc-menu |
149 | (make-sparse-keymap "Ediff Miscellanea")) | |
150 | (fset 'menu-bar-ediff-misc-menu | |
151 | (symbol-value 'menu-bar-ediff-misc-menu)) | |
8a10f781 | 152 | (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
fa2eb9ac | 153 | (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
8a10f781 | 154 | (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
fa2eb9ac MK |
155 | (fset 'menu-bar-ediff-merge-menu |
156 | (symbol-value 'menu-bar-ediff-merge-menu)) | |
8a10f781 | 157 | (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
fa2eb9ac MK |
158 | (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
159 | ||
160 | ;; define ediff-menu | |
f9b2678c | 161 | (define-key menu-bar-ediff-menu [window] |
4ae69eac MK |
162 | '("This Window and Next Window" . compare-windows)) |
163 | (define-key menu-bar-ediff-menu [ediff-windows-linewise] | |
164 | '("Windows Line-by-line..." . ediff-windows-linewise)) | |
165 | (define-key menu-bar-ediff-menu [ediff-windows-wordwise] | |
166 | '("Windows Word-by-word..." . ediff-windows-wordwise)) | |
167 | (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) | |
168 | (define-key menu-bar-ediff-menu [ediff-regions-linewise] | |
169 | '("Regions Line-by-line..." . ediff-regions-linewise)) | |
170 | (define-key menu-bar-ediff-menu [ediff-regions-wordwise] | |
171 | '("Regions Word-by-word..." . ediff-regions-wordwise)) | |
172 | (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) | |
fa2eb9ac | 173 | (define-key menu-bar-ediff-menu [ediff-dir-revision] |
190271b9 | 174 | '("Directory Revisions..." . ediff-directory-revisions)) |
fa2eb9ac | 175 | (define-key menu-bar-ediff-menu [ediff-revision] |
190271b9 | 176 | '("File with Revision..." . ediff-revision)) |
fa2eb9ac MK |
177 | (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
178 | (define-key menu-bar-ediff-menu [ediff-directories3] | |
190271b9 | 179 | '("Three Directories..." . ediff-directories3)) |
fa2eb9ac | 180 | (define-key menu-bar-ediff-menu [ediff-directories] |
190271b9 | 181 | '("Two Directories..." . ediff-directories)) |
fa2eb9ac MK |
182 | (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
183 | (define-key menu-bar-ediff-menu [ediff-buffers3] | |
190271b9 | 184 | '("Three Buffers..." . ediff-buffers3)) |
fa2eb9ac | 185 | (define-key menu-bar-ediff-menu [ediff-files3] |
190271b9 | 186 | '("Three Files..." . ediff-files3)) |
fa2eb9ac | 187 | (define-key menu-bar-ediff-menu [ediff-buffers] |
190271b9 | 188 | '("Two Buffers..." . ediff-buffers)) |
fa2eb9ac | 189 | (define-key menu-bar-ediff-menu [ediff-files] |
190271b9 | 190 | '("Two Files..." . ediff-files)) |
fa2eb9ac MK |
191 | |
192 | ;; define merge menu | |
193 | (define-key | |
194 | menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] | |
190271b9 | 195 | '("Directory Revisions with Ancestor..." |
fa2eb9ac MK |
196 | . ediff-merge-directory-revisions-with-ancestor)) |
197 | (define-key | |
198 | menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] | |
190271b9 | 199 | '("Directory Revisions..." . ediff-merge-directory-revisions)) |
fa2eb9ac MK |
200 | (define-key |
201 | menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] | |
190271b9 | 202 | '("Revisions with Ancestor..." |
fa2eb9ac MK |
203 | . ediff-merge-revisions-with-ancestor)) |
204 | (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] | |
190271b9 | 205 | '("Revisions..." . ediff-merge-revisions)) |
fa2eb9ac MK |
206 | (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) |
207 | (define-key | |
208 | menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] | |
190271b9 | 209 | '("Directories with Ancestor..." |
fa2eb9ac MK |
210 | . ediff-merge-directories-with-ancestor)) |
211 | (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] | |
190271b9 | 212 | '("Directories..." . ediff-merge-directories)) |
fa2eb9ac MK |
213 | (define-key |
214 | menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) | |
215 | (define-key | |
216 | menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] | |
190271b9 | 217 | '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
fa2eb9ac | 218 | (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] |
190271b9 | 219 | '("Buffers..." . ediff-merge-buffers)) |
fa2eb9ac | 220 | (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] |
190271b9 | 221 | '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
fa2eb9ac | 222 | (define-key menu-bar-ediff-merge-menu [ediff-merge-files] |
190271b9 | 223 | '("Files..." . ediff-merge-files)) |
fa2eb9ac MK |
224 | |
225 | ;; define epatch menu | |
226 | (define-key menu-bar-epatch-menu [ediff-patch-buffer] | |
190271b9 | 227 | '("To a Buffer..." . ediff-patch-buffer)) |
fa2eb9ac | 228 | (define-key menu-bar-epatch-menu [ediff-patch-file] |
ddc90f39 MK |
229 | '("To a File..." . ediff-patch-file)) |
230 | ||
231 | ;; define ediff miscellanea | |
232 | (define-key menu-bar-ediff-misc-menu [emultiframe] | |
233 | '("Toggle use of separate control buffer frame..." | |
234 | . ediff-toggle-multiframe)) | |
235 | (define-key menu-bar-ediff-misc-menu [eregistry] | |
236 | '("List Ediff Sessions..." . ediff-show-registry)) | |
3af0304a MK |
237 | (define-key menu-bar-ediff-misc-menu [ediff-cust] |
238 | '("Customize Ediff..." . ediff-customize)) | |
ddc90f39 MK |
239 | (define-key menu-bar-ediff-misc-menu [ediff-doc] |
240 | '("Ediff Manual..." . ediff-documentation)) | |
241 | ) | |
fa2eb9ac MK |
242 | |
243 | ) ; cond | |
244 | ||
f9b2678c | 245 | ;; arrange for autoloads |
fa2eb9ac MK |
246 | (if purify-flag |
247 | () ; if dumping, autoloads are set up in loaddefs.el | |
248 | ;; if the user decides to load this file, set up autoloads | |
249 | ;; compare files and buffers | |
250 | (autoload 'ediff "ediff" "Compare two files" t) | |
251 | (autoload 'ediff-files "ediff" "Compare two files" t) | |
252 | (autoload 'ediff-buffers "ediff" "Compare two bufers" t) | |
bbe6126c | 253 | (autoload 'ebuffers "ediff" "Compare two bufers" t) |
fa2eb9ac MK |
254 | (autoload 'ediff3 "ediff" "Compare three files" t) |
255 | (autoload 'ediff-files3 "ediff" "Compare three files" t) | |
256 | (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t) | |
bbe6126c | 257 | (autoload 'ebuffers3 "ediff" "Compare three bufers" t) |
fa2eb9ac | 258 | |
1e70790f | 259 | (autoload 'erevision "ediff" "Compare versions of a file" t) |
fa2eb9ac MK |
260 | (autoload 'ediff-revision "ediff" "Compare versions of a file" t) |
261 | ||
262 | ;; compare regions and windows | |
263 | (autoload 'ediff-windows-wordwise | |
bbe6126c | 264 | "ediff" "Compare two windows word-by-word." t) |
fa2eb9ac | 265 | (autoload 'ediff-regions-wordwise |
bbe6126c | 266 | "ediff" "Compare two regions word-by-word." t) |
fa2eb9ac | 267 | (autoload 'ediff-windows-linewise |
bbe6126c | 268 | "ediff" "Compare two windows line-by-line." t) |
fa2eb9ac | 269 | (autoload 'ediff-regions-linewise |
bbe6126c | 270 | "ediff" "Compare two regions line-by-line." t) |
fa2eb9ac MK |
271 | |
272 | ;; patch | |
bbe6126c MK |
273 | (autoload 'ediff-patch-file "ediff" "Patch a file." t) |
274 | (autoload 'epatch "ediff" "Patch a file." t) | |
275 | (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.") | |
276 | (autoload 'epatch-buffer "ediff" "Patch a buffer." t) | |
fa2eb9ac MK |
277 | |
278 | ;; merge | |
bbe6126c MK |
279 | (autoload 'ediff-merge "ediff" "Merge two files." t) |
280 | (autoload 'ediff-merge-files "ediff" "Merge two files." t) | |
fa2eb9ac | 281 | (autoload 'ediff-merge-files-with-ancestor |
bbe6126c MK |
282 | "ediff" "Merge two files using a third file as an ancestor." t) |
283 | (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t) | |
fa2eb9ac | 284 | (autoload 'ediff-merge-buffers-with-ancestor |
bbe6126c | 285 | "ediff" "Merge two buffers using a third buffer as an ancestor." t) |
fa2eb9ac | 286 | |
bbe6126c | 287 | (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t) |
fa2eb9ac | 288 | (autoload 'ediff-merge-revisions-with-ancestor |
bbe6126c | 289 | "ediff" "Merge two versions of a file." t) |
fa2eb9ac MK |
290 | |
291 | ;; compare directories | |
bbe6126c MK |
292 | (autoload 'edirs "ediff" "Compare files in two directories." t) |
293 | (autoload 'ediff-directories "ediff" "Compare files in two directories." t) | |
294 | (autoload 'edirs3 "ediff" "Compare files in three directories." t) | |
295 | (autoload | |
296 | 'ediff-directories3 "ediff" "Compare files in three directories." t) | |
fa2eb9ac MK |
297 | |
298 | (autoload 'edir-revisions | |
bbe6126c | 299 | "ediff" "Compare two versions of a file." t) |
fa2eb9ac | 300 | (autoload 'ediff-directory-revisions |
bbe6126c | 301 | "ediff" "Compare two versions of a file." t) |
fa2eb9ac MK |
302 | |
303 | ;; merge directories | |
bbe6126c | 304 | (autoload 'edirs-merge "ediff" "Merge files in two directories." t) |
fa2eb9ac | 305 | (autoload 'ediff-merge-directories |
bbe6126c | 306 | "ediff" "Merge files in two directories." t) |
fa2eb9ac MK |
307 | (autoload 'edirs-merge-with-ancestor |
308 | "ediff" | |
bbe6126c MK |
309 | "Merge files in two directories using files in a third dir as ancestors." |
310 | t) | |
fa2eb9ac MK |
311 | (autoload 'ediff-merge-directories-with-ancestor |
312 | "ediff" | |
bbe6126c MK |
313 | "Merge files in two directories using files in a third dir as ancestors." |
314 | t) | |
fa2eb9ac MK |
315 | |
316 | (autoload 'edir-merge-revisions | |
bbe6126c | 317 | "ediff" "Merge versions of files in a directory." t) |
fa2eb9ac | 318 | (autoload 'ediff-merge-directory-revisions |
bbe6126c | 319 | "ediff" "Merge versions of files in a directory." t) |
fa2eb9ac MK |
320 | (autoload 'ediff-merge-directory-revisions-with-ancestor |
321 | "ediff" | |
bbe6126c | 322 | "Merge versions of files in a directory using other versions as ancestors." |
fa2eb9ac MK |
323 | t) |
324 | (autoload 'edir-merge-revisions-with-ancestor | |
325 | "ediff" | |
bbe6126c | 326 | "Merge versions of files in a directory using other versions as ancestors." |
fa2eb9ac | 327 | t) |
f9b2678c MK |
328 | |
329 | ;; misc | |
fa2eb9ac | 330 | (autoload 'ediff-show-registry |
92c51e07 | 331 | "ediff-mult" |
bbe6126c MK |
332 | "Display the registry of active Ediff sessions." |
333 | t) | |
1e70790f MK |
334 | (autoload 'eregistry |
335 | "ediff-mult" | |
336 | "Display the registry of active Ediff sessions." | |
337 | t) | |
bbe6126c MK |
338 | (autoload 'ediff-documentation |
339 | "ediff" | |
340 | "Display Ediff's manual." | |
fa2eb9ac | 341 | t) |
f9b2678c MK |
342 | (autoload 'ediff-version |
343 | "ediff" | |
bbe6126c | 344 | "Show Ediff's version and last modification date." |
f9b2678c | 345 | t) |
bf5d92c5 MK |
346 | (autoload 'ediff-toggle-multiframe |
347 | "ediff-util" | |
348 | "Toggle the use of separate frame for Ediff control buffer." | |
349 | t) | |
ddc90f39 MK |
350 | (autoload 'ediff-toggle-use-toolbar |
351 | "ediff-util" | |
352 | "Toggle the use of Ediff toolbar." | |
353 | t) | |
354 | ||
fa2eb9ac MK |
355 | ) ; if purify-flag |
356 | ||
357 | ||
358 | (provide 'ediff-hook) | |
359 | ||
fa2eb9ac | 360 | ;;; ediff-hook.el ends here |