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