Mercurial > emacs
annotate lisp/ediff-hook.el @ 14530:71bca5a3c22d
(x_real_positions): Use XFree.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 09 Feb 1996 19:12:49 +0000 |
parents | 83f275dcd93a |
children | c768f6d7daaa |
rev | line source |
---|---|
13130 | 1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads |
14169 | 2 |
3 ;; Copyright (C) 1995 Free Software Foundation, Inc. | |
13130 | 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 | |
14169 | 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. | |
13130 | 23 |
14169 | 24 ;;; Code: |
13130 | 25 |
14169 | 26 ;; These must be placed in menu-bar.el in Emacs |
13130 | 27 ;; |
28 ;; (define-key menu-bar-tools-menu [eregistry] | |
29 ;; '("List Ediff Sessions" . ediff-show-registry)) | |
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 | |
37 | |
38 (defun ediff-xemacs-init-menus () | |
39 (if (featurep 'menubar) | |
40 (progn | |
41 (add-submenu | |
42 '("Tools") ediff-menu "OO-Browser...") | |
43 (add-submenu | |
44 '("Tools") ediff-merge-menu "OO-Browser...") | |
45 (add-submenu | |
46 '("Tools") epatch-menu "OO-Browser...") | |
47 (add-menu-button | |
48 '("Tools") | |
49 ["List Ediff Sessions" ediff-show-registry t] "OO-Browser...") | |
50 (add-menu-button | |
51 '("Tools") | |
52 ["---" nil nil] "OO-Browser...") | |
53 ))) | |
54 | |
55 | |
56 | |
57 ;; explicit string-match is needed: ediff-xemacs-p is not defined at build time | |
58 (cond ((string-match "XEmacs" emacs-version) | |
59 (defvar ediff-menu | |
60 '("Compare" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
61 ["Two Files..." ediff-files t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
62 ["Two Buffers..." ediff-buffers t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
63 ["Three Files..." ediff-files3 t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
64 ["Three Buffers..." ediff-buffers3 t] |
13130 | 65 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
66 ["Two Directories..." ediff-directories t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
67 ["Three Directories..." ediff-directories3 t] |
13130 | 68 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
69 ["File with Revision..." ediff-revision t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
70 ["Directory Revisions..." ediff-directory-revisions t] |
13130 | 71 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
72 ["Windows Word-by-word..." ediff-windows-wordwise t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
73 ["Windows Line-by-line..." ediff-windows-linewise t] |
13130 | 74 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
75 ["Regions Word-by-word..." ediff-regions-wordwise t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
76 ["Regions Line-by-line..." ediff-regions-linewise t])) |
13130 | 77 (defvar ediff-merge-menu |
78 '("Merge" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
79 ["Files..." ediff-merge-files t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
80 ["Files with Ancestor..." ediff-merge-files-with-ancestor t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
81 ["Buffers..." ediff-merge-buffers t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
82 ["Buffers with Ancestor..." |
13130 | 83 ediff-merge-buffers-with-ancestor t] |
84 "---" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
85 ["Directories..." ediff-merge-directories t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
86 ["Directories with Ancestor..." |
13130 | 87 ediff-merge-directories-with-ancestor t] |
88 "---" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
89 ["Revisions..." ediff-merge-revisions t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
90 ["Revisions with Ancestor..." |
13130 | 91 ediff-merge-revisions-with-ancestor t] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
92 ["Directory Revisions..." ediff-merge-directory-revisions t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
93 ["Directory Revisions with Ancestor..." |
13130 | 94 ediff-merge-directory-revisions-with-ancestor t])) |
95 (defvar epatch-menu | |
96 '("Apply Patch" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
97 ["To a file..." ediff-patch-file t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
98 ["To a buffer..." ediff-patch-buffer t])) |
13130 | 99 |
100 ;; put these menus before Object-Oriented-Browser in Tools menu | |
101 (add-hook 'before-init-hook 'ediff-xemacs-init-menus) | |
102 ;; this `if' is to be deleted before going into distribution | |
103 (if (not purify-flag) | |
104 (ediff-xemacs-init-menus)) | |
105 ) | |
106 | |
107 ;; Emacs--only if menu-bar is loaded | |
108 ((featurep 'menu-bar) | |
109 ;; initialize menu bar keymaps | |
13608
0f665b0b653f
(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents:
13606
diff
changeset
|
110 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
13130 | 111 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
13608
0f665b0b653f
(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents:
13606
diff
changeset
|
112 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
13130 | 113 (fset 'menu-bar-ediff-merge-menu |
114 (symbol-value 'menu-bar-ediff-merge-menu)) | |
13608
0f665b0b653f
(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents:
13606
diff
changeset
|
115 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
13130 | 116 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
117 | |
118 ;; define ediff-menu | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
119 (define-key menu-bar-ediff-menu [window] |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
120 '("This Window And Next Window" . compare-windows)) |
13130 | 121 (define-key menu-bar-ediff-menu [ediff-dir-revision] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
122 '("Directory Revisions..." . ediff-directory-revisions)) |
13130 | 123 (define-key menu-bar-ediff-menu [ediff-revision] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
124 '("File with Revision..." . ediff-revision)) |
13130 | 125 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
126 (define-key menu-bar-ediff-menu [ediff-directories3] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
127 '("Three Directories..." . ediff-directories3)) |
13130 | 128 (define-key menu-bar-ediff-menu [ediff-directories] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
129 '("Two Directories..." . ediff-directories)) |
13130 | 130 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
131 (define-key menu-bar-ediff-menu [ediff-buffers3] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
132 '("Three Buffers..." . ediff-buffers3)) |
13130 | 133 (define-key menu-bar-ediff-menu [ediff-files3] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
134 '("Three Files..." . ediff-files3)) |
13130 | 135 (define-key menu-bar-ediff-menu [ediff-buffers] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
136 '("Two Buffers..." . ediff-buffers)) |
13130 | 137 (define-key menu-bar-ediff-menu [ediff-files] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
138 '("Two Files..." . ediff-files)) |
13130 | 139 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) |
140 (define-key menu-bar-ediff-menu [ediff-regions-linewise] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
141 '("Regions Line-by-line..." . ediff-regions-linewise)) |
13130 | 142 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
143 '("Regions Word-by-word..." . ediff-regions-wordwise)) |
13130 | 144 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) |
145 (define-key menu-bar-ediff-menu [ediff-windows-linewise] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
146 '("Windows Line-by-line..." . ediff-windows-linewise)) |
13130 | 147 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
148 '("Windows Word-by-word..." . ediff-windows-wordwise)) |
13130 | 149 |
150 ;; define merge menu | |
151 (define-key | |
152 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
153 '("Directory Revisions with Ancestor..." |
13130 | 154 . ediff-merge-directory-revisions-with-ancestor)) |
155 (define-key | |
156 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
157 '("Directory Revisions..." . ediff-merge-directory-revisions)) |
13130 | 158 (define-key |
159 menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
160 '("Revisions with Ancestor..." |
13130 | 161 . ediff-merge-revisions-with-ancestor)) |
162 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
163 '("Revisions..." . ediff-merge-revisions)) |
13130 | 164 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) |
165 (define-key | |
166 menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
167 '("Directories with Ancestor..." |
13130 | 168 . ediff-merge-directories-with-ancestor)) |
169 (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
170 '("Directories..." . ediff-merge-directories)) |
13130 | 171 (define-key |
172 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) | |
173 (define-key | |
174 menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
175 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
13130 | 176 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
177 '("Buffers..." . ediff-merge-buffers)) |
13130 | 178 (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
179 '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
13130 | 180 (define-key menu-bar-ediff-merge-menu [ediff-merge-files] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
181 '("Files..." . ediff-merge-files)) |
13130 | 182 |
183 ;; define epatch menu | |
184 (define-key menu-bar-epatch-menu [ediff-patch-buffer] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
185 '("To a Buffer..." . ediff-patch-buffer)) |
13130 | 186 (define-key menu-bar-epatch-menu [ediff-patch-file] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
187 '("To a File..." . ediff-patch-file))) |
13130 | 188 |
189 ) ; cond | |
190 | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
191 ;; arrange for autoloads |
13130 | 192 (if purify-flag |
193 () ; if dumping, autoloads are set up in loaddefs.el | |
194 ;; if the user decides to load this file, set up autoloads | |
195 ;; compare files and buffers | |
196 (autoload 'ediff "ediff" "Compare two files" t) | |
197 (autoload 'ediff-files "ediff" "Compare two files" t) | |
198 (autoload 'ediff-buffers "ediff" "Compare two bufers" t) | |
199 (autoload 'ediff3 "ediff" "Compare three files" t) | |
200 (autoload 'ediff-files3 "ediff" "Compare three files" t) | |
201 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t) | |
202 | |
203 (autoload 'ediff-revision "ediff" "Compare versions of a file" t) | |
204 | |
205 ;; compare regions and windows | |
206 (autoload 'ediff-windows-wordwise | |
207 "ediff" "Compare two windows word-by-word" t) | |
208 (autoload 'ediff-regions-wordwise | |
209 "ediff" "Compare two regions word-by-word" t) | |
210 (autoload 'ediff-windows-linewise | |
211 "ediff" "Compare two windows line-by-line" t) | |
212 (autoload 'ediff-regions-linewise | |
213 "ediff" "Compare two regions line-by-line" t) | |
214 | |
215 ;; patch | |
216 (autoload 'ediff-patch-file "ediff" "Patch a file" t) | |
217 (autoload 'epatch "ediff" "Patch a file" t) | |
218 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer") | |
219 (autoload 'epatch-buffer "ediff" "Patch a buffer" t) | |
220 | |
221 ;; merge | |
222 (autoload 'ediff-merge "ediff" "Merge two files" t) | |
223 (autoload 'ediff-merge-files "ediff" "Merge two files" t) | |
224 (autoload 'ediff-merge-files-with-ancestor | |
225 "ediff" "Merge two files using a third file as an ancestor" t) | |
226 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers" t) | |
227 (autoload 'ediff-merge-buffers-with-ancestor | |
228 "ediff" "Merge two buffers using a third buffer as an ancestor" t) | |
229 | |
230 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file" t) | |
231 (autoload 'ediff-merge-revisions-with-ancestor | |
232 "ediff" "Merge two versions of a file" t) | |
233 | |
234 ;; compare directories | |
235 (autoload 'edirs "ediff" "Compare files in two directories" t) | |
236 (autoload 'ediff-directories "ediff" "Compare files in two directories" t) | |
237 (autoload 'edirs3 "ediff" "Compare files in three directories" t) | |
238 (autoload 'ediff-directories3 "ediff" "Compare files in three directories" t) | |
239 | |
240 (autoload 'edir-revisions | |
241 "ediff" "Compare two versions of a file" t) | |
242 (autoload 'ediff-directory-revisions | |
243 "ediff" "Compare two versions of a file" t) | |
244 | |
245 ;; merge directories | |
246 (autoload 'edirs-merge "ediff" "Merge files in two directories" t) | |
247 (autoload 'ediff-merge-directories | |
248 "ediff" "Merge files in two directories" t) | |
249 (autoload 'edirs-merge-with-ancestor | |
250 "ediff" | |
251 "Merge files in two directories using files in a third dir as ancestors" t) | |
252 (autoload 'ediff-merge-directories-with-ancestor | |
253 "ediff" | |
254 "Merge files in two directories using files in a third dir as ancestors" t) | |
255 | |
256 (autoload 'edir-merge-revisions | |
257 "ediff" "Merge versions of files in a directory" t) | |
258 (autoload 'ediff-merge-directory-revisions | |
259 "ediff" "Merge versions of files in a directory" t) | |
260 (autoload 'ediff-merge-directory-revisions-with-ancestor | |
261 "ediff" | |
262 "Merge versions of files in a directory using other versions as ancestors" | |
263 t) | |
264 (autoload 'edir-merge-revisions-with-ancestor | |
265 "ediff" | |
266 "Merge versions of files in a directory using other versions as ancestors" | |
267 t) | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
268 |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
269 ;; misc |
13130 | 270 (autoload 'ediff-show-registry |
13606
b8307fa77dfd
(ediff-show-registry): Use renamed file ediff-mult.
Richard M. Stallman <rms@gnu.org>
parents:
13215
diff
changeset
|
271 "ediff-mult" |
13130 | 272 "Display the registry of active Ediff sessions" |
273 t) | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
274 (autoload 'ediff-version |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
275 "ediff" |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
276 "Show Ediff's version and last modification date" |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
277 t) |
13130 | 278 ) ; if purify-flag |
279 | |
280 | |
281 (provide 'ediff-hook) | |
282 | |
283 | |
284 ;;; ediff-hook.el ends here |