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