Mercurial > emacs
annotate lisp/vc/ediff-hook.el @ 110682:ba6a1c230532
gnus-html.el (gnus-html-prefetch-images): Adjust regexp to avoid regexp backtrace overflows.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Fri, 01 Oct 2010 13:33:03 +0000 |
parents | 280c8ae2476d |
children | 1b626601d32d 417b1e4d63cd |
rev | line source |
---|---|
13130 | 1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads |
14169 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, |
106815 | 4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
13130 | 5 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
108970
diff
changeset
|
7 ;; Package: ediff |
13130 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
13130 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) any later version. |
13130 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
13130 | 23 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
35411
diff
changeset
|
24 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
35411
diff
changeset
|
25 |
14169 | 26 ;;; Code: |
13130 | 27 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
28 ;;; These must be placed in menu-bar.el in Emacs |
13130 | 29 ;; |
18054 | 30 ;; (define-key menu-bar-tools-menu [ediff-misc] |
31 ;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu)) | |
13130 | 32 ;; (define-key menu-bar-tools-menu [epatch] |
33 ;; '("Apply Patch" . menu-bar-epatch-menu)) | |
34 ;; (define-key menu-bar-tools-menu [ediff-merge] | |
35 ;; '("Merge" . menu-bar-ediff-merge-menu)) | |
36 ;; (define-key menu-bar-tools-menu [ediff] | |
37 ;; '("Compare" . menu-bar-ediff-menu)) | |
38 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
39 ;; Compiler pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
40 (defvar ediff-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
41 (defvar ediff-merge-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
42 (defvar epatch-menu) |
18054 | 43 (defvar ediff-misc-menu) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
44 ;; end pacifier |
13130 | 45 |
18054 | 46 ;; allow menus to be set up without ediff-wind.el being loaded |
47 (defvar ediff-window-setup-function) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
48 |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
49 ;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
50 ;; emacs, but it is needed in XEmacs |
47520
a37b476e1aec
2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
45034
diff
changeset
|
51 ;;;###autoload |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
52 (if (featurep 'xemacs) |
92948
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92503
diff
changeset
|
53 (progn |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
54 (defun ediff-xemacs-init-menus () |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
55 (when (featurep 'menubar) |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
56 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
57 '("Tools") ediff-menu "OO-Browser...") |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
58 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
59 '("Tools") ediff-merge-menu "OO-Browser...") |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
60 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
61 '("Tools") epatch-menu "OO-Browser...") |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
62 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
63 '("Tools") ediff-misc-menu "OO-Browser...") |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
64 (add-menu-button |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
65 '("Tools") "-------" "OO-Browser...") |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
66 )) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
67 (defvar ediff-menu |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
68 '("Compare" |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
69 ["Two Files..." ediff-files t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
70 ["Two Buffers..." ediff-buffers t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
71 ["Three Files..." ediff-files3 t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
72 ["Three Buffers..." ediff-buffers3 t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
73 "---" |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
74 ["Two Directories..." ediff-directories t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
75 ["Three Directories..." ediff-directories3 t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
76 "---" |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
77 ["File with Revision..." ediff-revision t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
78 ["Directory Revisions..." ediff-directory-revisions t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
79 "---" |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
80 ["Windows Word-by-word..." ediff-windows-wordwise t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
81 ["Windows Line-by-line..." ediff-windows-linewise t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
82 "---" |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
83 ["Regions Word-by-word..." ediff-regions-wordwise t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
84 ["Regions Line-by-line..." ediff-regions-linewise t] |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
85 )) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
86 (defvar ediff-merge-menu |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
87 '("Merge" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
88 ["Files..." ediff-merge-files t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
89 ["Files with Ancestor..." ediff-merge-files-with-ancestor t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
90 ["Buffers..." ediff-merge-buffers t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
91 ["Buffers with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
92 ediff-merge-buffers-with-ancestor t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
93 "---" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
94 ["Directories..." ediff-merge-directories t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
95 ["Directories with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
96 ediff-merge-directories-with-ancestor t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
97 "---" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
98 ["Revisions..." ediff-merge-revisions t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
99 ["Revisions with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
100 ediff-merge-revisions-with-ancestor t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
101 ["Directory Revisions..." ediff-merge-directory-revisions t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
102 ["Directory Revisions with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
103 ediff-merge-directory-revisions-with-ancestor t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
104 )) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
105 (defvar epatch-menu |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
106 '("Apply Patch" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
107 ["To a file..." ediff-patch-file t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
108 ["To a buffer..." ediff-patch-buffer t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
109 )) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
110 (defvar ediff-misc-menu |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
111 '("Ediff Miscellanea" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
112 ["Ediff Manual" ediff-documentation t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
113 ["Customize Ediff" ediff-customize t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
114 ["List Ediff Sessions" ediff-show-registry t] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
115 ["Use separate frame for Ediff control buffer" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
116 ediff-toggle-multiframe |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
117 :style toggle |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
118 :selected (if (and (featurep 'ediff-util) |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
119 (boundp 'ediff-window-setup-function)) |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
120 (eq ediff-window-setup-function |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
121 'ediff-setup-windows-multiframe))] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
122 ["Use a toolbar with Ediff control buffer" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
123 ediff-toggle-use-toolbar |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
124 :style toggle |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
125 :selected (if (featurep 'ediff-tbar) |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
126 (ediff-use-toolbar-p))])) |
105235
f2e56d1eff32
* menu-bar.el: Remove menu-bar-ediff-misc-menu from the Tools
Chong Yidong <cyd@stupidchicken.com>
parents:
105049
diff
changeset
|
127 |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
128 ;; put these menus before Object-Oriented-Browser in Tools menu |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
129 (if (and (featurep 'menubar) (not (featurep 'infodock)) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
130 (not (featurep 'ediff-hook))) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
131 (ediff-xemacs-init-menus))) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
132 ;; Emacs |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
133 ;; initialize menu bar keymaps |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
134 (defvar menu-bar-ediff-misc-menu |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
135 (make-sparse-keymap "Ediff Miscellanea")) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
136 (fset 'menu-bar-ediff-misc-menu |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
137 (symbol-value 'menu-bar-ediff-misc-menu)) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
138 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
139 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
140 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
141 (fset 'menu-bar-ediff-merge-menu |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
142 (symbol-value 'menu-bar-ediff-merge-menu)) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
143 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
144 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
105235
f2e56d1eff32
* menu-bar.el: Remove menu-bar-ediff-misc-menu from the Tools
Chong Yidong <cyd@stupidchicken.com>
parents:
105049
diff
changeset
|
145 |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
146 ;; define ediff compare menu |
105235
f2e56d1eff32
* menu-bar.el: Remove menu-bar-ediff-misc-menu from the Tools
Chong Yidong <cyd@stupidchicken.com>
parents:
105049
diff
changeset
|
147 (define-key menu-bar-ediff-menu [ediff-misc] |
105744
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105235
diff
changeset
|
148 `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu)) |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
149 (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
150 (define-key menu-bar-ediff-menu [window] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
151 `(menu-item ,(purecopy "This Window and Next Window") compare-windows |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
152 :help ,(purecopy "Compare the current window and the next window"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
153 (define-key menu-bar-ediff-menu [ediff-windows-linewise] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
154 `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
155 :help ,(purecopy "Compare windows line-wise"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
156 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
157 `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
158 :help ,(purecopy "Compare windows word-wise"))) |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
159 (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
160 (define-key menu-bar-ediff-menu [ediff-regions-linewise] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
161 `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
162 :help ,(purecopy "Compare regions line-wise"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
163 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
164 `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
165 :help ,(purecopy "Compare regions word-wise"))) |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
166 (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
167 (define-key menu-bar-ediff-menu [ediff-dir-revision] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
168 `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
169 :help ,(purecopy "Compare directory files with their older versions"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
170 (define-key menu-bar-ediff-menu [ediff-revision] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
171 `(menu-item ,(purecopy "File with Revision...") ediff-revision |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
172 :help ,(purecopy "Compare file with its older versions"))) |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
173 (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
174 (define-key menu-bar-ediff-menu [ediff-directories3] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
175 `(menu-item ,(purecopy "Three Directories...") ediff-directories3 |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
176 :help ,(purecopy "Compare files common to three directories simultaneously"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
177 (define-key menu-bar-ediff-menu [ediff-directories] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
178 `(menu-item ,(purecopy "Two Directories...") ediff-directories |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
179 :help ,(purecopy "Compare files common to two directories simultaneously"))) |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
180 (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
181 (define-key menu-bar-ediff-menu [ediff-buffers3] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
182 `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3 |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
183 :help ,(purecopy "Compare three buffers simultaneously"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
184 (define-key menu-bar-ediff-menu [ediff-files3] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
185 `(menu-item ,(purecopy "Three Files...") ediff-files3 |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
186 :help ,(purecopy "Compare three files simultaneously"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
187 (define-key menu-bar-ediff-menu [ediff-buffers] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
188 `(menu-item ,(purecopy "Two Buffers...") ediff-buffers |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
189 :help ,(purecopy "Compare two buffers simultaneously"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
190 (define-key menu-bar-ediff-menu [ediff-files] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
191 `(menu-item ,(purecopy "Two Files...") ediff-files |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
192 :help ,(purecopy "Compare two files simultaneously"))) |
13130 | 193 |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
194 ;; define ediff merge menu |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
195 (define-key |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
196 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
197 `(menu-item ,(purecopy "Directory Revisions with Ancestor...") |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
198 ediff-merge-directory-revisions-with-ancestor |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
199 :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
200 (define-key |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
201 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
202 `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
203 :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
204 (define-key |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
205 menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
206 `(menu-item ,(purecopy "Revisions with Ancestor...") |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
207 ediff-merge-revisions-with-ancestor |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
208 :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
209 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
210 `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
211 :help ,(purecopy "Merge versions of the same file (without using ancestor information)"))) |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
212 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
213 (define-key |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
214 menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
215 `(menu-item ,(purecopy "Directories with Ancestor...") |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
216 ediff-merge-directories-with-ancestor |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
217 :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
218 (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
219 `(menu-item ,(purecopy "Directories...") ediff-merge-directories |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
220 :help ,(purecopy "Merge files common to a pair of directories"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
221 (define-key |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
222 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
223 (define-key |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
224 menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
225 `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
226 :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
227 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
228 `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
229 :help ,(purecopy "Merge buffers (without using ancestor information)"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
230 (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
231 `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
232 :help ,(purecopy "Merge files by comparing them with a common ancestor"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
233 (define-key menu-bar-ediff-merge-menu [ediff-merge-files] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
234 `(menu-item ,(purecopy "Files...") ediff-merge-files |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
235 :help ,(purecopy "Merge files (without using ancestor information)"))) |
13130 | 236 |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
237 ;; define epatch menu |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
238 (define-key menu-bar-epatch-menu [ediff-patch-buffer] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
239 `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
240 :help ,(purecopy "Apply a patch to the contents of a buffer"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
241 (define-key menu-bar-epatch-menu [ediff-patch-file] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
242 `(menu-item ,(purecopy "To a File...") ediff-patch-file |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
243 :help ,(purecopy "Apply a patch to a file"))) |
18054 | 244 |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
245 ;; define ediff miscellanea |
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
246 (define-key menu-bar-ediff-misc-menu [emultiframe] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
247 `(menu-item ,(purecopy "Use separate control buffer frame") |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
248 ediff-toggle-multiframe |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
249 :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
250 (define-key menu-bar-ediff-misc-menu [eregistry] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
251 `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
252 :help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
253 (define-key menu-bar-ediff-misc-menu [ediff-cust] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
254 `(menu-item ,(purecopy "Customize Ediff") ediff-customize |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
255 :help ,(purecopy "Change some of the parameters that govern the behavior of Ediff"))) |
92503
b3aa17396fef
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents:
92493
diff
changeset
|
256 (define-key menu-bar-ediff-misc-menu [ediff-doc] |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
257 `(menu-item ,(purecopy "Ediff Manual") ediff-documentation |
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
258 :help ,(purecopy "Bring up the Ediff manual")))) |
13130 | 259 |
260 (provide 'ediff-hook) | |
261 | |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
262 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93652
diff
changeset
|
263 ;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3 |
13130 | 264 ;;; ediff-hook.el ends here |