Require cl only when compiling.
[emacs.git] / lisp / ediff-hook.el
blob9c4c4c48af8c6ed1faeb50776562ba209ca68c82
1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
3 ;; Copyright (C) 1995 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
7 ;; This file is part of GNU Emacs.
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.
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.
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.
24 ;;; Code:
26 ;;; These must be placed in menu-bar.el in Emacs
28 ;; (define-key menu-bar-tools-menu [ediff-doc]
29 ;; '("Ediff Manual..." . ediff-documentation))
30 ;; (define-key menu-bar-tools-menu [eregistry]
31 ;; '("List Ediff Sessions..." . ediff-show-registry))
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))
40 (defun ediff-xemacs-init-menus ()
41 (if (featurep 'menubar)
42 (progn
43 (add-submenu
44 '("Tools") ediff-menu "OO-Browser...")
45 (add-submenu
46 '("Tools") ediff-merge-menu "OO-Browser...")
47 (add-submenu
48 '("Tools") epatch-menu "OO-Browser...")
49 (add-menu-button
50 '("Tools")
51 ["List Ediff Sessions..." ediff-show-registry t] "OO-Browser...")
52 (add-menu-button
53 '("Tools")
54 ["Ediff Manual..." ediff-documentation t] "OO-Browser...")
55 (add-menu-button
56 '("Tools")
57 ["-------" nil nil] "OO-Browser...")
58 )))
61 ;; explicit string-match is needed: ediff-xemacs-p is not defined at build time
62 (cond ((string-match "XEmacs" emacs-version)
63 (defvar ediff-menu
64 '("Compare"
65 ["Two Files..." ediff-files t]
66 ["Two Buffers..." ediff-buffers t]
67 ["Three Files..." ediff-files3 t]
68 ["Three Buffers..." ediff-buffers3 t]
69 "---"
70 ["Two Directories..." ediff-directories t]
71 ["Three Directories..." ediff-directories3 t]
72 "---"
73 ["File with Revision..." ediff-revision t]
74 ["Directory Revisions..." ediff-directory-revisions t]
75 "---"
76 ["Windows Word-by-word..." ediff-windows-wordwise t]
77 ["Windows Line-by-line..." ediff-windows-linewise t]
78 "---"
79 ["Regions Word-by-word..." ediff-regions-wordwise t]
80 ["Regions Line-by-line..." ediff-regions-linewise t]
82 (defvar ediff-merge-menu
83 '("Merge"
84 ["Files..." ediff-merge-files t]
85 ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
86 ["Buffers..." ediff-merge-buffers t]
87 ["Buffers with Ancestor..."
88 ediff-merge-buffers-with-ancestor t]
89 "---"
90 ["Directories..." ediff-merge-directories t]
91 ["Directories with Ancestor..."
92 ediff-merge-directories-with-ancestor t]
93 "---"
94 ["Revisions..." ediff-merge-revisions t]
95 ["Revisions with Ancestor..."
96 ediff-merge-revisions-with-ancestor t]
97 ["Directory Revisions..." ediff-merge-directory-revisions t]
98 ["Directory Revisions with Ancestor..."
99 ediff-merge-directory-revisions-with-ancestor t]
101 (defvar epatch-menu
102 '("Apply Patch"
103 ["To a file..." ediff-patch-file t]
104 ["To a buffer..." ediff-patch-buffer t]
107 ;; put these menus before Object-Oriented-Browser in Tools menu
108 (add-hook 'before-init-hook 'ediff-xemacs-init-menus)
109 (if (not purify-flag)
110 (ediff-xemacs-init-menus))
113 ;; Emacs--only if menu-bar is loaded
114 ((featurep 'menu-bar)
115 ;; initialize menu bar keymaps
116 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
117 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
118 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
119 (fset 'menu-bar-ediff-merge-menu
120 (symbol-value 'menu-bar-ediff-merge-menu))
121 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
122 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
124 ;; define ediff-menu
125 (define-key menu-bar-ediff-menu [window]
126 '("This Window and Next Window" . compare-windows))
127 (define-key menu-bar-ediff-menu [ediff-windows-linewise]
128 '("Windows Line-by-line..." . ediff-windows-linewise))
129 (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
130 '("Windows Word-by-word..." . ediff-windows-wordwise))
131 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
132 (define-key menu-bar-ediff-menu [ediff-regions-linewise]
133 '("Regions Line-by-line..." . ediff-regions-linewise))
134 (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
135 '("Regions Word-by-word..." . ediff-regions-wordwise))
136 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
137 (define-key menu-bar-ediff-menu [ediff-dir-revision]
138 '("Directory Revisions..." . ediff-directory-revisions))
139 (define-key menu-bar-ediff-menu [ediff-revision]
140 '("File with Revision..." . ediff-revision))
141 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
142 (define-key menu-bar-ediff-menu [ediff-directories3]
143 '("Three Directories..." . ediff-directories3))
144 (define-key menu-bar-ediff-menu [ediff-directories]
145 '("Two Directories..." . ediff-directories))
146 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
147 (define-key menu-bar-ediff-menu [ediff-buffers3]
148 '("Three Buffers..." . ediff-buffers3))
149 (define-key menu-bar-ediff-menu [ediff-files3]
150 '("Three Files..." . ediff-files3))
151 (define-key menu-bar-ediff-menu [ediff-buffers]
152 '("Two Buffers..." . ediff-buffers))
153 (define-key menu-bar-ediff-menu [ediff-files]
154 '("Two Files..." . ediff-files))
156 ;; define merge menu
157 (define-key
158 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
159 '("Directory Revisions with Ancestor..."
160 . ediff-merge-directory-revisions-with-ancestor))
161 (define-key
162 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
163 '("Directory Revisions..." . ediff-merge-directory-revisions))
164 (define-key
165 menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
166 '("Revisions with Ancestor..."
167 . ediff-merge-revisions-with-ancestor))
168 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
169 '("Revisions..." . ediff-merge-revisions))
170 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
171 (define-key
172 menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
173 '("Directories with Ancestor..."
174 . ediff-merge-directories-with-ancestor))
175 (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
176 '("Directories..." . ediff-merge-directories))
177 (define-key
178 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
179 (define-key
180 menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
181 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
182 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
183 '("Buffers..." . ediff-merge-buffers))
184 (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
185 '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
186 (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
187 '("Files..." . ediff-merge-files))
189 ;; define epatch menu
190 (define-key menu-bar-epatch-menu [ediff-patch-buffer]
191 '("To a Buffer..." . ediff-patch-buffer))
192 (define-key menu-bar-epatch-menu [ediff-patch-file]
193 '("To a File..." . ediff-patch-file)))
195 ) ; cond
197 ;; arrange for autoloads
198 (if purify-flag
199 () ; if dumping, autoloads are set up in loaddefs.el
200 ;; if the user decides to load this file, set up autoloads
201 ;; compare files and buffers
202 (autoload 'ediff "ediff" "Compare two files" t)
203 (autoload 'ediff-files "ediff" "Compare two files" t)
204 (autoload 'ediff-buffers "ediff" "Compare two bufers" t)
205 (autoload 'ediff3 "ediff" "Compare three files" t)
206 (autoload 'ediff-files3 "ediff" "Compare three files" t)
207 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
209 (autoload 'ediff-revision "ediff" "Compare versions of a file" t)
211 ;; compare regions and windows
212 (autoload 'ediff-windows-wordwise
213 "ediff" "Compare two windows word-by-word" t)
214 (autoload 'ediff-regions-wordwise
215 "ediff" "Compare two regions word-by-word" t)
216 (autoload 'ediff-windows-linewise
217 "ediff" "Compare two windows line-by-line" t)
218 (autoload 'ediff-regions-linewise
219 "ediff" "Compare two regions line-by-line" t)
221 ;; patch
222 (autoload 'ediff-patch-file "ediff" "Patch a file" t)
223 (autoload 'epatch "ediff" "Patch a file" t)
224 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer")
225 (autoload 'epatch-buffer "ediff" "Patch a buffer" t)
227 ;; merge
228 (autoload 'ediff-merge "ediff" "Merge two files" t)
229 (autoload 'ediff-merge-files "ediff" "Merge two files" t)
230 (autoload 'ediff-merge-files-with-ancestor
231 "ediff" "Merge two files using a third file as an ancestor" t)
232 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers" t)
233 (autoload 'ediff-merge-buffers-with-ancestor
234 "ediff" "Merge two buffers using a third buffer as an ancestor" t)
236 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file" t)
237 (autoload 'ediff-merge-revisions-with-ancestor
238 "ediff" "Merge two versions of a file" t)
240 ;; compare directories
241 (autoload 'edirs "ediff" "Compare files in two directories" t)
242 (autoload 'ediff-directories "ediff" "Compare files in two directories" t)
243 (autoload 'edirs3 "ediff" "Compare files in three directories" t)
244 (autoload 'ediff-directories3 "ediff" "Compare files in three directories" t)
246 (autoload 'edir-revisions
247 "ediff" "Compare two versions of a file" t)
248 (autoload 'ediff-directory-revisions
249 "ediff" "Compare two versions of a file" t)
251 ;; merge directories
252 (autoload 'edirs-merge "ediff" "Merge files in two directories" t)
253 (autoload 'ediff-merge-directories
254 "ediff" "Merge files in two directories" t)
255 (autoload 'edirs-merge-with-ancestor
256 "ediff"
257 "Merge files in two directories using files in a third dir as ancestors" t)
258 (autoload 'ediff-merge-directories-with-ancestor
259 "ediff"
260 "Merge files in two directories using files in a third dir as ancestors" t)
262 (autoload 'edir-merge-revisions
263 "ediff" "Merge versions of files in a directory" t)
264 (autoload 'ediff-merge-directory-revisions
265 "ediff" "Merge versions of files in a directory" t)
266 (autoload 'ediff-merge-directory-revisions-with-ancestor
267 "ediff"
268 "Merge versions of files in a directory using other versions as ancestors"
270 (autoload 'edir-merge-revisions-with-ancestor
271 "ediff"
272 "Merge versions of files in a directory using other versions as ancestors"
275 ;; misc
276 (autoload 'ediff-show-registry
277 "ediff-meta"
278 "Display the registry of active Ediff sessions"
280 (autoload 'ediff-version
281 "ediff"
282 "Show Ediff's version and last modification date"
284 ) ; if purify-flag
287 (provide 'ediff-hook)
290 ;;; ediff-hook.el ends here