Mercurial > emacs
annotate lisp/ediff-hook.el @ 24419:30e478cd167e
(shell-command-default-error-buffer): Renamed from
shell-command-on-region-default-error-buffer.
(shell-command-on-region): Mention in echo area when there
is some error output. Mention success or failure, too.
Accumulate multiple error outputs
going forward, with formfeed in between. Display the error buffer
when we have put something in it.
(shell-command): Add the ERROR-BUFFER argument feature.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 01 Mar 1999 03:19:32 +0000 |
parents | f44ff2c52fac |
children | 4f315ca65976 |
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 | |
20206 | 129 ;; (add-hook 'before-init-hook 'ediff-xemacs-init-menus) |
130 ;; (if (not purify-flag) | |
131 ;; (ediff-xemacs-init-menus)) | |
132 ;; ) | |
133 (ediff-xemacs-init-menus)) | |
13130 | 134 |
135 ;; Emacs--only if menu-bar is loaded | |
136 ((featurep 'menu-bar) | |
137 ;; initialize menu bar keymaps | |
18054 | 138 (defvar menu-bar-ediff-misc-menu |
139 (make-sparse-keymap "Ediff Miscellanea")) | |
140 (fset 'menu-bar-ediff-misc-menu | |
141 (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
|
142 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
13130 | 143 (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
|
144 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
13130 | 145 (fset 'menu-bar-ediff-merge-menu |
146 (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
|
147 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
13130 | 148 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
149 | |
150 ;; define ediff-menu | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
151 (define-key menu-bar-ediff-menu [window] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
152 '("This Window and Next Window" . compare-windows)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
153 (define-key menu-bar-ediff-menu [ediff-windows-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
154 '("Windows Line-by-line..." . ediff-windows-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
155 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
156 '("Windows Word-by-word..." . ediff-windows-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
157 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
158 (define-key menu-bar-ediff-menu [ediff-regions-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
159 '("Regions Line-by-line..." . ediff-regions-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
160 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
161 '("Regions Word-by-word..." . ediff-regions-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
162 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) |
13130 | 163 (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
|
164 '("Directory Revisions..." . ediff-directory-revisions)) |
13130 | 165 (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
|
166 '("File with Revision..." . ediff-revision)) |
13130 | 167 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
168 (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
|
169 '("Three Directories..." . ediff-directories3)) |
13130 | 170 (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
|
171 '("Two Directories..." . ediff-directories)) |
13130 | 172 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
173 (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
|
174 '("Three Buffers..." . ediff-buffers3)) |
13130 | 175 (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
|
176 '("Three Files..." . ediff-files3)) |
13130 | 177 (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
|
178 '("Two Buffers..." . ediff-buffers)) |
13130 | 179 (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
|
180 '("Two Files..." . ediff-files)) |
13130 | 181 |
182 ;; define merge menu | |
183 (define-key | |
184 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
|
185 '("Directory Revisions with Ancestor..." |
13130 | 186 . ediff-merge-directory-revisions-with-ancestor)) |
187 (define-key | |
188 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
|
189 '("Directory Revisions..." . ediff-merge-directory-revisions)) |
13130 | 190 (define-key |
191 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
|
192 '("Revisions with Ancestor..." |
13130 | 193 . ediff-merge-revisions-with-ancestor)) |
194 (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
|
195 '("Revisions..." . ediff-merge-revisions)) |
13130 | 196 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) |
197 (define-key | |
198 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
|
199 '("Directories with Ancestor..." |
13130 | 200 . ediff-merge-directories-with-ancestor)) |
201 (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
|
202 '("Directories..." . ediff-merge-directories)) |
13130 | 203 (define-key |
204 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) | |
205 (define-key | |
206 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
|
207 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
13130 | 208 (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
|
209 '("Buffers..." . ediff-merge-buffers)) |
13130 | 210 (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
|
211 '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
13130 | 212 (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
|
213 '("Files..." . ediff-merge-files)) |
13130 | 214 |
215 ;; define epatch menu | |
216 (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
|
217 '("To a Buffer..." . ediff-patch-buffer)) |
13130 | 218 (define-key menu-bar-epatch-menu [ediff-patch-file] |
18054 | 219 '("To a File..." . ediff-patch-file)) |
220 | |
221 ;; define ediff miscellanea | |
222 (define-key menu-bar-ediff-misc-menu [emultiframe] | |
223 '("Toggle use of separate control buffer frame..." | |
224 . ediff-toggle-multiframe)) | |
225 (define-key menu-bar-ediff-misc-menu [eregistry] | |
226 '("List Ediff Sessions..." . ediff-show-registry)) | |
227 (define-key menu-bar-ediff-misc-menu [ediff-doc] | |
228 '("Ediff Manual..." . ediff-documentation)) | |
229 ) | |
13130 | 230 |
231 ) ; cond | |
232 | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
233 ;; arrange for autoloads |
13130 | 234 (if purify-flag |
235 () ; if dumping, autoloads are set up in loaddefs.el | |
236 ;; if the user decides to load this file, set up autoloads | |
237 ;; compare files and buffers | |
238 (autoload 'ediff "ediff" "Compare two files" t) | |
239 (autoload 'ediff-files "ediff" "Compare two files" t) | |
240 (autoload 'ediff-buffers "ediff" "Compare two bufers" t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
241 (autoload 'ebuffers "ediff" "Compare two bufers" t) |
13130 | 242 (autoload 'ediff3 "ediff" "Compare three files" t) |
243 (autoload 'ediff-files3 "ediff" "Compare three files" t) | |
244 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
245 (autoload 'ebuffers3 "ediff" "Compare three bufers" t) |
13130 | 246 |
18839 | 247 (autoload 'erevision "ediff" "Compare versions of a file" t) |
13130 | 248 (autoload 'ediff-revision "ediff" "Compare versions of a file" t) |
249 | |
250 ;; compare regions and windows | |
251 (autoload 'ediff-windows-wordwise | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
252 "ediff" "Compare two windows word-by-word." t) |
13130 | 253 (autoload 'ediff-regions-wordwise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
254 "ediff" "Compare two regions word-by-word." t) |
13130 | 255 (autoload 'ediff-windows-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
256 "ediff" "Compare two windows line-by-line." t) |
13130 | 257 (autoload 'ediff-regions-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
258 "ediff" "Compare two regions line-by-line." t) |
13130 | 259 |
260 ;; patch | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
261 (autoload 'ediff-patch-file "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
262 (autoload 'epatch "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
263 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.") |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
264 (autoload 'epatch-buffer "ediff" "Patch a buffer." t) |
13130 | 265 |
266 ;; merge | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
267 (autoload 'ediff-merge "ediff" "Merge two files." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
268 (autoload 'ediff-merge-files "ediff" "Merge two files." t) |
13130 | 269 (autoload 'ediff-merge-files-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
270 "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
|
271 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t) |
13130 | 272 (autoload 'ediff-merge-buffers-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
273 "ediff" "Merge two buffers using a third buffer as an ancestor." t) |
13130 | 274 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
275 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t) |
13130 | 276 (autoload 'ediff-merge-revisions-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
277 "ediff" "Merge two versions of a file." t) |
13130 | 278 |
279 ;; compare directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
280 (autoload 'edirs "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
281 (autoload 'ediff-directories "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
282 (autoload 'edirs3 "ediff" "Compare files in three directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
283 (autoload |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
284 'ediff-directories3 "ediff" "Compare files in three directories." t) |
13130 | 285 |
286 (autoload 'edir-revisions | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
287 "ediff" "Compare two versions of a file." t) |
13130 | 288 (autoload 'ediff-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
289 "ediff" "Compare two versions of a file." t) |
13130 | 290 |
291 ;; merge directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
292 (autoload 'edirs-merge "ediff" "Merge files in two directories." t) |
13130 | 293 (autoload 'ediff-merge-directories |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
294 "ediff" "Merge files in two directories." t) |
13130 | 295 (autoload 'edirs-merge-with-ancestor |
296 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
297 "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
|
298 t) |
13130 | 299 (autoload 'ediff-merge-directories-with-ancestor |
300 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
301 "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
|
302 t) |
13130 | 303 |
304 (autoload 'edir-merge-revisions | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
305 "ediff" "Merge versions of files in a directory." t) |
13130 | 306 (autoload 'ediff-merge-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
307 "ediff" "Merge versions of files in a directory." t) |
13130 | 308 (autoload 'ediff-merge-directory-revisions-with-ancestor |
309 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
310 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 311 t) |
312 (autoload 'edir-merge-revisions-with-ancestor | |
313 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
314 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 315 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
316 |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
317 ;; misc |
13130 | 318 (autoload 'ediff-show-registry |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
319 "ediff-mult" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
320 "Display the registry of active Ediff sessions." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
321 t) |
18839 | 322 (autoload 'eregistry |
323 "ediff-mult" | |
324 "Display the registry of active Ediff sessions." | |
325 t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
326 (autoload 'ediff-documentation |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
327 "ediff" |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
328 "Display Ediff's manual." |
13130 | 329 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
330 (autoload 'ediff-version |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
331 "ediff" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
332 "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
|
333 t) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
334 (autoload 'ediff-toggle-multiframe |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
335 "ediff-util" |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
336 "Toggle the use of separate frame for Ediff control buffer." |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
337 t) |
18054 | 338 (autoload 'ediff-toggle-use-toolbar |
339 "ediff-util" | |
340 "Toggle the use of Ediff toolbar." | |
341 t) | |
342 | |
13130 | 343 ) ; if purify-flag |
344 | |
345 | |
346 (provide 'ediff-hook) | |
347 | |
348 | |
349 ;;; ediff-hook.el ends here |