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