Mercurial > emacs
annotate lisp/ediff-hook.el @ 108111:69bfc9e4ceb6
Fix crash with bidi display on the last empty line (bug#6030).
xdisp.c (display_line): Don't assume 2nd call to
get_next_display_element cannot return zero.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sun, 25 Apr 2010 17:42:34 +0300 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
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> |
13130 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
13130 | 11 ;; 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
|
12 ;; 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
|
13 ;; (at your option) any later version. |
13130 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; 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
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
13130 | 22 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
35411
diff
changeset
|
23 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
35411
diff
changeset
|
24 |
14169 | 25 ;;; Code: |
13130 | 26 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
27 ;;; These must be placed in menu-bar.el in Emacs |
13130 | 28 ;; |
18054 | 29 ;; (define-key menu-bar-tools-menu [ediff-misc] |
30 ;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu)) | |
13130 | 31 ;; (define-key menu-bar-tools-menu [epatch] |
32 ;; '("Apply Patch" . menu-bar-epatch-menu)) | |
33 ;; (define-key menu-bar-tools-menu [ediff-merge] | |
34 ;; '("Merge" . menu-bar-ediff-merge-menu)) | |
35 ;; (define-key menu-bar-tools-menu [ediff] | |
36 ;; '("Compare" . menu-bar-ediff-menu)) | |
37 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
38 ;; Compiler pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
39 (defvar ediff-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
40 (defvar ediff-merge-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
41 (defvar epatch-menu) |
18054 | 42 (defvar ediff-misc-menu) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
43 ;; end pacifier |
13130 | 44 |
18054 | 45 ;; allow menus to be set up without ediff-wind.el being loaded |
46 (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
|
47 |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
48 ;; 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
|
49 ;; 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
|
50 ;;;###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
|
51 (if (featurep 'xemacs) |
92948
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92503
diff
changeset
|
52 (progn |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
53 (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
|
54 (when (featurep 'menubar) |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
55 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
56 '("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
|
57 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
58 '("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
|
59 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
60 '("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
|
61 (add-submenu |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
62 '("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
|
63 (add-menu-button |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
64 '("Tools") "-------" "OO-Browser...") |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
65 )) |
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
|
66 (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
|
67 '("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
|
68 ["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
|
69 ["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
|
70 ["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
|
71 ["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
|
72 "---" |
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 ["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
|
74 ["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
|
75 "---" |
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 ["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
|
77 ["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
|
78 "---" |
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 ["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
|
80 ["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
|
81 "---" |
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 ["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
|
83 ["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
|
84 )) |
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 (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
|
86 '("Merge" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
87 ["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
|
88 ["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
|
89 ["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
|
90 ["Buffers with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
91 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
|
92 "---" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
93 ["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
|
94 ["Directories with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
95 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
|
96 "---" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
97 ["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
|
98 ["Revisions with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
99 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
|
100 ["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
|
101 ["Directory Revisions with Ancestor..." |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
102 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
|
103 )) |
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
|
104 (defvar epatch-menu |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
105 '("Apply Patch" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
106 ["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
|
107 ["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
|
108 )) |
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
|
109 (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
|
110 '("Ediff Miscellanea" |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
111 ["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
|
112 ["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
|
113 ["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
|
114 ["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
|
115 ediff-toggle-multiframe |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
116 :style toggle |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
117 :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
|
118 (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
|
119 (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
|
120 'ediff-setup-windows-multiframe))] |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
121 ["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
|
122 ediff-toggle-use-toolbar |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
123 :style toggle |
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
124 :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
|
125 (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
|
126 |
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
|
127 ;; 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
|
128 (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
|
129 (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
|
130 (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
|
131 ;; 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
|
132 ;; 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
|
133 (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
|
134 (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
|
135 (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
|
136 (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
|
137 (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
|
138 (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
|
139 (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
|
140 (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
|
141 (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
|
142 (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
|
143 (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
|
144 |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
145 ;; 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
|
146 (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
|
147 `(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
|
148 (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
|
149 (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
|
150 `(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
|
151 :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
|
152 (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
|
153 `(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
|
154 :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
|
155 (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
|
156 `(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
|
157 :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
|
158 (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
|
159 (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
|
160 `(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
|
161 :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
|
162 (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
|
163 `(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
|
164 :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
|
165 (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
|
166 (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
|
167 `(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
|
168 :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
|
169 (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
|
170 `(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
|
171 :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
|
172 (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
|
173 (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
|
174 `(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
|
175 :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
|
176 (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
|
177 `(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
|
178 :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
|
179 (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
|
180 (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
|
181 `(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
|
182 :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
|
183 (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
|
184 `(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
|
185 :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
|
186 (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
|
187 `(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
|
188 :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
|
189 (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
|
190 `(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
|
191 :help ,(purecopy "Compare two files simultaneously"))) |
13130 | 192 |
99829
46834e8b7d0f
2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
94678
diff
changeset
|
193 ;; 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
|
194 (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
|
195 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
|
196 `(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
|
197 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
|
198 :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
|
199 (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
|
200 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
|
201 `(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
|
202 :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
|
203 (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
|
204 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
|
205 `(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
|
206 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
|
207 :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
|
208 (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
|
209 `(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
|
210 :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
|
211 (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
|
212 (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
|
213 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
|
214 `(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
|
215 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
|
216 :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
|
217 (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
|
218 `(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
|
219 :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
|
220 (define-key |
105940
f7147d70f6ef
* subr.el (menu-bar-separator): New defconst.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
221 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
|
222 (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
|
223 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
|
224 `(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
|
225 :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
|
226 (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
|
227 `(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
|
228 :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
|
229 (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
|
230 `(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
|
231 :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
|
232 (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
|
233 `(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
|
234 :help ,(purecopy "Merge files (without using ancestor information)"))) |
13130 | 235 |
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
|
236 ;; 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
|
237 (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
|
238 `(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
|
239 :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
|
240 (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
|
241 `(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
|
242 :help ,(purecopy "Apply a patch to a file"))) |
18054 | 243 |
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
|
244 ;; 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
|
245 (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
|
246 `(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
|
247 ediff-toggle-multiframe |
105049
4b7d5275d592
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
248 :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
|
249 (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
|
250 `(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
|
251 :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
|
252 (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
|
253 `(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
|
254 :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
|
255 (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
|
256 `(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
|
257 :help ,(purecopy "Bring up the Ediff manual")))) |
13130 | 258 |
259 (provide 'ediff-hook) | |
260 | |
93652
6523ed37006c
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
92951
diff
changeset
|
261 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93652
diff
changeset
|
262 ;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3 |
13130 | 263 ;;; ediff-hook.el ends here |