Mercurial > emacs
annotate lisp/ediff-hook.el @ 15050:7cc3bad1b93e
(after-find-file): Mention file name in "auto save is newer" message.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 19 Apr 1996 09:32:55 +0000 |
parents | c768f6d7daaa |
children | 43a3308fcf61 |
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 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
26 ;;; These must be placed in menu-bar.el in Emacs |
13130 | 27 ;; |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
28 ;; (define-key menu-bar-tools-menu [ediff-doc] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
29 ;; '("Ediff Manual..." . ediff-documentation)) |
13130 | 30 ;; (define-key menu-bar-tools-menu [eregistry] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
31 ;; '("List Ediff Sessions..." . ediff-show-registry)) |
13130 | 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)) | |
38 | |
39 | |
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") | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
51 ["List Ediff Sessions..." ediff-show-registry t] "OO-Browser...") |
13130 | 52 (add-menu-button |
53 '("Tools") | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
54 ["Ediff Manual..." ediff-documentation t] "OO-Browser...") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
55 (add-menu-button |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
56 '("Tools") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
57 ["-------" nil nil] "OO-Browser...") |
13130 | 58 ))) |
59 | |
60 | |
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" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
65 ["Two Files..." ediff-files t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
66 ["Two Buffers..." ediff-buffers t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
67 ["Three Files..." ediff-files3 t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
68 ["Three Buffers..." ediff-buffers3 t] |
13130 | 69 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
70 ["Two Directories..." ediff-directories t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
71 ["Three Directories..." ediff-directories3 t] |
13130 | 72 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
73 ["File with Revision..." ediff-revision t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
74 ["Directory Revisions..." ediff-directory-revisions t] |
13130 | 75 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
76 ["Windows Word-by-word..." ediff-windows-wordwise t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
77 ["Windows Line-by-line..." ediff-windows-linewise t] |
13130 | 78 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
79 ["Regions Word-by-word..." ediff-regions-wordwise t] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
80 ["Regions Line-by-line..." ediff-regions-linewise t] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
81 )) |
13130 | 82 (defvar ediff-merge-menu |
83 '("Merge" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
84 ["Files..." ediff-merge-files t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
85 ["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
|
86 ["Buffers..." ediff-merge-buffers t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
87 ["Buffers with Ancestor..." |
13130 | 88 ediff-merge-buffers-with-ancestor t] |
89 "---" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
90 ["Directories..." ediff-merge-directories t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
91 ["Directories with Ancestor..." |
13130 | 92 ediff-merge-directories-with-ancestor t] |
93 "---" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
94 ["Revisions..." ediff-merge-revisions t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
95 ["Revisions with Ancestor..." |
13130 | 96 ediff-merge-revisions-with-ancestor t] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
97 ["Directory Revisions..." ediff-merge-directory-revisions t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
98 ["Directory Revisions with Ancestor..." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
99 ediff-merge-directory-revisions-with-ancestor t] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
100 )) |
13130 | 101 (defvar epatch-menu |
102 '("Apply Patch" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
103 ["To a file..." ediff-patch-file t] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
104 ["To a buffer..." ediff-patch-buffer t] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
105 )) |
13130 | 106 |
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)) | |
111 ) | |
112 | |
113 ;; Emacs--only if menu-bar is loaded | |
114 ((featurep 'menu-bar) | |
115 ;; 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
|
116 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
13130 | 117 (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
|
118 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
13130 | 119 (fset 'menu-bar-ediff-merge-menu |
120 (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
|
121 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
13130 | 122 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
123 | |
124 ;; define ediff-menu | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
125 (define-key menu-bar-ediff-menu [window] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
126 '("This Window and Next Window" . compare-windows)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
127 (define-key menu-bar-ediff-menu [ediff-windows-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
128 '("Windows Line-by-line..." . ediff-windows-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
129 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
130 '("Windows Word-by-word..." . ediff-windows-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
131 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
132 (define-key menu-bar-ediff-menu [ediff-regions-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
133 '("Regions Line-by-line..." . ediff-regions-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
134 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
135 '("Regions Word-by-word..." . ediff-regions-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
136 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) |
13130 | 137 (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
|
138 '("Directory Revisions..." . ediff-directory-revisions)) |
13130 | 139 (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
|
140 '("File with Revision..." . ediff-revision)) |
13130 | 141 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
142 (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
|
143 '("Three Directories..." . ediff-directories3)) |
13130 | 144 (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
|
145 '("Two Directories..." . ediff-directories)) |
13130 | 146 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
147 (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
|
148 '("Three Buffers..." . ediff-buffers3)) |
13130 | 149 (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
|
150 '("Three Files..." . ediff-files3)) |
13130 | 151 (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
|
152 '("Two Buffers..." . ediff-buffers)) |
13130 | 153 (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
|
154 '("Two Files..." . ediff-files)) |
13130 | 155 |
156 ;; define merge menu | |
157 (define-key | |
158 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
|
159 '("Directory Revisions with Ancestor..." |
13130 | 160 . ediff-merge-directory-revisions-with-ancestor)) |
161 (define-key | |
162 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
|
163 '("Directory Revisions..." . ediff-merge-directory-revisions)) |
13130 | 164 (define-key |
165 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
|
166 '("Revisions with Ancestor..." |
13130 | 167 . ediff-merge-revisions-with-ancestor)) |
168 (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
|
169 '("Revisions..." . ediff-merge-revisions)) |
13130 | 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] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
173 '("Directories with Ancestor..." |
13130 | 174 . ediff-merge-directories-with-ancestor)) |
175 (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
|
176 '("Directories..." . ediff-merge-directories)) |
13130 | 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] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
181 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
13130 | 182 (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
|
183 '("Buffers..." . ediff-merge-buffers)) |
13130 | 184 (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
|
185 '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
13130 | 186 (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
|
187 '("Files..." . ediff-merge-files)) |
13130 | 188 |
189 ;; define epatch menu | |
190 (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
|
191 '("To a Buffer..." . ediff-patch-buffer)) |
13130 | 192 (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
|
193 '("To a File..." . ediff-patch-file))) |
13130 | 194 |
195 ) ; cond | |
196 | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
197 ;; arrange for autoloads |
13130 | 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) | |
208 | |
209 (autoload 'ediff-revision "ediff" "Compare versions of a file" t) | |
210 | |
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) | |
220 | |
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) | |
226 | |
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) | |
235 | |
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) | |
239 | |
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) | |
245 | |
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) | |
250 | |
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) | |
261 | |
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" | |
269 t) | |
270 (autoload 'edir-merge-revisions-with-ancestor | |
271 "ediff" | |
272 "Merge versions of files in a directory using other versions as ancestors" | |
273 t) | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
274 |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
275 ;; misc |
13130 | 276 (autoload 'ediff-show-registry |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
277 "ediff-meta" |
13130 | 278 "Display the registry of active Ediff sessions" |
279 t) | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
280 (autoload 'ediff-version |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
281 "ediff" |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
282 "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
|
283 t) |
13130 | 284 ) ; if purify-flag |
285 | |
286 | |
287 (provide 'ediff-hook) | |
288 | |
289 | |
290 ;;; ediff-hook.el ends here |