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