Mercurial > emacs
annotate lisp/ediff-hook.el @ 19029:9ccea8ddd344 libc-970729 libc-970730 libc-970731 libc-970801
update from main archive 970728
author | Ulrich Drepper <drepper@redhat.com> |
---|---|
date | Mon, 28 Jul 1997 23:37:45 +0000 |
parents | 1405083241e8 |
children | f44ff2c52fac |
rev | line source |
---|---|
13130 | 1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads |
14169 | 2 |
18054 | 3 ;; Copyright (C) 1995, 1996, 1997 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 ;; |
18054 | 28 ;; (define-key menu-bar-tools-menu [ediff-misc] |
29 ;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu)) | |
13130 | 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 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
37 ;; Compiler pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
38 (defvar ediff-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
39 (defvar ediff-merge-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
40 (defvar epatch-menu) |
18054 | 41 (defvar ediff-misc-menu) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
42 ;; end pacifier |
13130 | 43 |
18054 | 44 ;; allow menus to be set up without ediff-wind.el being loaded |
45 (defvar ediff-window-setup-function) | |
46 | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
47 |
13130 | 48 (defun ediff-xemacs-init-menus () |
49 (if (featurep 'menubar) | |
50 (progn | |
51 (add-submenu | |
52 '("Tools") ediff-menu "OO-Browser...") | |
53 (add-submenu | |
54 '("Tools") ediff-merge-menu "OO-Browser...") | |
55 (add-submenu | |
56 '("Tools") epatch-menu "OO-Browser...") | |
18054 | 57 (add-submenu |
58 '("Tools") ediff-misc-menu "OO-Browser...") | |
13130 | 59 (add-menu-button |
60 '("Tools") | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
61 ["-------" nil nil] "OO-Browser...") |
13130 | 62 ))) |
63 | |
64 | |
65 ;; explicit string-match is needed: ediff-xemacs-p is not defined at build time | |
66 (cond ((string-match "XEmacs" emacs-version) | |
67 (defvar ediff-menu | |
68 '("Compare" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
69 ["Two Files..." ediff-files t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
70 ["Two Buffers..." ediff-buffers t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
71 ["Three Files..." ediff-files3 t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
72 ["Three Buffers..." ediff-buffers3 t] |
13130 | 73 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
74 ["Two Directories..." ediff-directories t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
75 ["Three Directories..." ediff-directories3 t] |
13130 | 76 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
77 ["File with Revision..." ediff-revision t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
78 ["Directory Revisions..." ediff-directory-revisions t] |
13130 | 79 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
80 ["Windows Word-by-word..." ediff-windows-wordwise t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
81 ["Windows Line-by-line..." ediff-windows-linewise t] |
13130 | 82 "---" |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
83 ["Regions Word-by-word..." ediff-regions-wordwise t] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
84 ["Regions Line-by-line..." ediff-regions-linewise t] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
85 )) |
13130 | 86 (defvar ediff-merge-menu |
87 '("Merge" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
88 ["Files..." ediff-merge-files t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
89 ["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
|
90 ["Buffers..." ediff-merge-buffers t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
91 ["Buffers with Ancestor..." |
13130 | 92 ediff-merge-buffers-with-ancestor t] |
93 "---" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
94 ["Directories..." ediff-merge-directories t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
95 ["Directories with Ancestor..." |
13130 | 96 ediff-merge-directories-with-ancestor t] |
97 "---" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
98 ["Revisions..." ediff-merge-revisions t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
99 ["Revisions with Ancestor..." |
13130 | 100 ediff-merge-revisions-with-ancestor t] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
101 ["Directory Revisions..." ediff-merge-directory-revisions t] |
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
102 ["Directory Revisions with Ancestor..." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
103 ediff-merge-directory-revisions-with-ancestor t] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
104 )) |
13130 | 105 (defvar epatch-menu |
106 '("Apply Patch" | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
107 ["To a file..." ediff-patch-file t] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
108 ["To a buffer..." ediff-patch-buffer t] |
18054 | 109 )) |
110 (defvar ediff-misc-menu | |
111 '("Ediff Miscellanea" | |
112 ["Ediff Manual..." ediff-documentation t] | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
113 ["List Ediff Sessions..." ediff-show-registry t] |
18054 | 114 ["Use separate frame for Ediff control buffer..." |
115 ediff-toggle-multiframe | |
116 :style toggle | |
117 :selected (if (and (featurep 'ediff-util) | |
118 (boundp 'ediff-window-setup-function)) | |
119 (eq ediff-window-setup-function | |
120 'ediff-setup-windows-multiframe))] | |
121 ["Use a toolbar with Ediff control buffer" | |
122 ediff-toggle-use-toolbar | |
123 :style toggle | |
124 :selected (if (featurep 'ediff-tbar) | |
125 (ediff-use-toolbar-p))] | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
126 )) |
13130 | 127 |
128 ;; put these menus before Object-Oriented-Browser in Tools menu | |
129 (add-hook 'before-init-hook 'ediff-xemacs-init-menus) | |
130 (if (not purify-flag) | |
131 (ediff-xemacs-init-menus)) | |
132 ) | |
133 | |
134 ;; Emacs--only if menu-bar is loaded | |
135 ((featurep 'menu-bar) | |
136 ;; initialize menu bar keymaps | |
18054 | 137 (defvar menu-bar-ediff-misc-menu |
138 (make-sparse-keymap "Ediff Miscellanea")) | |
139 (fset 'menu-bar-ediff-misc-menu | |
140 (symbol-value 'menu-bar-ediff-misc-menu)) | |
13608
0f665b0b653f
(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents:
13606
diff
changeset
|
141 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
13130 | 142 (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
|
143 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
13130 | 144 (fset 'menu-bar-ediff-merge-menu |
145 (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
|
146 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
13130 | 147 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
148 | |
149 ;; define ediff-menu | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
150 (define-key menu-bar-ediff-menu [window] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
151 '("This Window and Next Window" . compare-windows)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
152 (define-key menu-bar-ediff-menu [ediff-windows-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
153 '("Windows Line-by-line..." . ediff-windows-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
154 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
155 '("Windows Word-by-word..." . ediff-windows-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
156 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
157 (define-key menu-bar-ediff-menu [ediff-regions-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
158 '("Regions Line-by-line..." . ediff-regions-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
159 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
160 '("Regions Word-by-word..." . ediff-regions-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
161 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) |
13130 | 162 (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
|
163 '("Directory Revisions..." . ediff-directory-revisions)) |
13130 | 164 (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
|
165 '("File with Revision..." . ediff-revision)) |
13130 | 166 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
167 (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
|
168 '("Three Directories..." . ediff-directories3)) |
13130 | 169 (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
|
170 '("Two Directories..." . ediff-directories)) |
13130 | 171 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
172 (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
|
173 '("Three Buffers..." . ediff-buffers3)) |
13130 | 174 (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
|
175 '("Three Files..." . ediff-files3)) |
13130 | 176 (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
|
177 '("Two Buffers..." . ediff-buffers)) |
13130 | 178 (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
|
179 '("Two Files..." . ediff-files)) |
13130 | 180 |
181 ;; define merge menu | |
182 (define-key | |
183 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
|
184 '("Directory Revisions with Ancestor..." |
13130 | 185 . ediff-merge-directory-revisions-with-ancestor)) |
186 (define-key | |
187 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
|
188 '("Directory Revisions..." . ediff-merge-directory-revisions)) |
13130 | 189 (define-key |
190 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
|
191 '("Revisions with Ancestor..." |
13130 | 192 . ediff-merge-revisions-with-ancestor)) |
193 (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
|
194 '("Revisions..." . ediff-merge-revisions)) |
13130 | 195 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) |
196 (define-key | |
197 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
|
198 '("Directories with Ancestor..." |
13130 | 199 . ediff-merge-directories-with-ancestor)) |
200 (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
|
201 '("Directories..." . ediff-merge-directories)) |
13130 | 202 (define-key |
203 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) | |
204 (define-key | |
205 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
|
206 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
13130 | 207 (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
|
208 '("Buffers..." . ediff-merge-buffers)) |
13130 | 209 (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
|
210 '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
13130 | 211 (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
|
212 '("Files..." . ediff-merge-files)) |
13130 | 213 |
214 ;; define epatch menu | |
215 (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
|
216 '("To a Buffer..." . ediff-patch-buffer)) |
13130 | 217 (define-key menu-bar-epatch-menu [ediff-patch-file] |
18054 | 218 '("To a File..." . ediff-patch-file)) |
219 | |
220 ;; define ediff miscellanea | |
221 (define-key menu-bar-ediff-misc-menu [emultiframe] | |
222 '("Toggle use of separate control buffer frame..." | |
223 . ediff-toggle-multiframe)) | |
224 (define-key menu-bar-ediff-misc-menu [eregistry] | |
225 '("List Ediff Sessions..." . ediff-show-registry)) | |
226 (define-key menu-bar-ediff-misc-menu [ediff-doc] | |
227 '("Ediff Manual..." . ediff-documentation)) | |
228 ) | |
13130 | 229 |
230 ) ; cond | |
231 | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
232 ;; arrange for autoloads |
13130 | 233 (if purify-flag |
234 () ; if dumping, autoloads are set up in loaddefs.el | |
235 ;; if the user decides to load this file, set up autoloads | |
236 ;; compare files and buffers | |
237 (autoload 'ediff "ediff" "Compare two files" t) | |
238 (autoload 'ediff-files "ediff" "Compare two files" t) | |
239 (autoload 'ediff-buffers "ediff" "Compare two bufers" t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
240 (autoload 'ebuffers "ediff" "Compare two bufers" t) |
13130 | 241 (autoload 'ediff3 "ediff" "Compare three files" t) |
242 (autoload 'ediff-files3 "ediff" "Compare three files" t) | |
243 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
244 (autoload 'ebuffers3 "ediff" "Compare three bufers" t) |
13130 | 245 |
18839 | 246 (autoload 'erevision "ediff" "Compare versions of a file" t) |
13130 | 247 (autoload 'ediff-revision "ediff" "Compare versions of a file" t) |
248 | |
249 ;; compare regions and windows | |
250 (autoload 'ediff-windows-wordwise | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
251 "ediff" "Compare two windows word-by-word." t) |
13130 | 252 (autoload 'ediff-regions-wordwise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
253 "ediff" "Compare two regions word-by-word." t) |
13130 | 254 (autoload 'ediff-windows-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
255 "ediff" "Compare two windows line-by-line." t) |
13130 | 256 (autoload 'ediff-regions-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
257 "ediff" "Compare two regions line-by-line." t) |
13130 | 258 |
259 ;; patch | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
260 (autoload 'ediff-patch-file "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
261 (autoload 'epatch "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
262 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.") |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
263 (autoload 'epatch-buffer "ediff" "Patch a buffer." t) |
13130 | 264 |
265 ;; merge | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
266 (autoload 'ediff-merge "ediff" "Merge two files." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
267 (autoload 'ediff-merge-files "ediff" "Merge two files." t) |
13130 | 268 (autoload 'ediff-merge-files-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
269 "ediff" "Merge two files using a third file as an ancestor." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
270 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t) |
13130 | 271 (autoload 'ediff-merge-buffers-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
272 "ediff" "Merge two buffers using a third buffer as an ancestor." t) |
13130 | 273 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
274 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t) |
13130 | 275 (autoload 'ediff-merge-revisions-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
276 "ediff" "Merge two versions of a file." t) |
13130 | 277 |
278 ;; compare directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
279 (autoload 'edirs "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
280 (autoload 'ediff-directories "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
281 (autoload 'edirs3 "ediff" "Compare files in three directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
282 (autoload |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
283 'ediff-directories3 "ediff" "Compare files in three directories." t) |
13130 | 284 |
285 (autoload 'edir-revisions | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
286 "ediff" "Compare two versions of a file." t) |
13130 | 287 (autoload 'ediff-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
288 "ediff" "Compare two versions of a file." t) |
13130 | 289 |
290 ;; merge directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
291 (autoload 'edirs-merge "ediff" "Merge files in two directories." t) |
13130 | 292 (autoload 'ediff-merge-directories |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
293 "ediff" "Merge files in two directories." t) |
13130 | 294 (autoload 'edirs-merge-with-ancestor |
295 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
296 "Merge files in two directories using files in a third dir as ancestors." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
297 t) |
13130 | 298 (autoload 'ediff-merge-directories-with-ancestor |
299 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
300 "Merge files in two directories using files in a third dir as ancestors." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
301 t) |
13130 | 302 |
303 (autoload 'edir-merge-revisions | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
304 "ediff" "Merge versions of files in a directory." t) |
13130 | 305 (autoload 'ediff-merge-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
306 "ediff" "Merge versions of files in a directory." t) |
13130 | 307 (autoload 'ediff-merge-directory-revisions-with-ancestor |
308 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
309 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 310 t) |
311 (autoload 'edir-merge-revisions-with-ancestor | |
312 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
313 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 314 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
315 |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
316 ;; misc |
13130 | 317 (autoload 'ediff-show-registry |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
318 "ediff-mult" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
319 "Display the registry of active Ediff sessions." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
320 t) |
18839 | 321 (autoload 'eregistry |
322 "ediff-mult" | |
323 "Display the registry of active Ediff sessions." | |
324 t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
325 (autoload 'ediff-documentation |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
326 "ediff" |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
327 "Display Ediff's manual." |
13130 | 328 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
329 (autoload 'ediff-version |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
330 "ediff" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
331 "Show Ediff's version and last modification date." |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
332 t) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
333 (autoload 'ediff-toggle-multiframe |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
334 "ediff-util" |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
335 "Toggle the use of separate frame for Ediff control buffer." |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
336 t) |
18054 | 337 (autoload 'ediff-toggle-use-toolbar |
338 "ediff-util" | |
339 "Toggle the use of Ediff toolbar." | |
340 t) | |
341 | |
13130 | 342 ) ; if purify-flag |
343 | |
344 | |
345 (provide 'ediff-hook) | |
346 | |
347 | |
348 ;;; ediff-hook.el ends here |