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