Mercurial > emacs

annotate lisp/ediff-hook.el @ 93177:470ea273abbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(xterm-mouse-event): Avoid error with buttons > 5.
author Andreas Schwab <schwab@suse.de>
date Mon, 24 Mar 2008 09:28:05 +0000
parents 5a094feef463
children 6523ed37006c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14109
diff changeset
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,
79721
73661ddc7ac7 Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 79272
diff changeset
4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
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
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
7
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
9
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
78236
9355f9b7bbff Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 75347
diff changeset
12 ;; the Free Software Foundation; either version 3, or (at your option)
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
13 ;; any later version.
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
14
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
18 ;; GNU General Public License for more details.
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
19
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14109
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64091
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61026
diff changeset
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61026
diff changeset
23 ;; Boston, MA 02110-1301, USA.
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
24
38422
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 35411
diff changeset
25 ;;; Commentary:
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 35411
diff changeset
26
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14109
diff changeset
27 ;;; Code:
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
28
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
29 ;;; These must be placed in menu-bar.el in Emacs
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
30 ;;
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
31 ;; (define-key menu-bar-tools-menu [ediff-misc]
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
32 ;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
33 ;; (define-key menu-bar-tools-menu [epatch]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
34 ;; '("Apply Patch" . menu-bar-epatch-menu))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
35 ;; (define-key menu-bar-tools-menu [ediff-merge]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
36 ;; '("Merge" . menu-bar-ediff-merge-menu))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
37 ;; (define-key menu-bar-tools-menu [ediff]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
38 ;; '("Compare" . menu-bar-ediff-menu))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
39
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
40 ;; Compiler pacifier
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
41 (defvar ediff-menu)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
42 (defvar ediff-merge-menu)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
43 (defvar epatch-menu)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
44 (defvar ediff-misc-menu)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
45 ;; end pacifier
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
46
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
47 ;; allow menus to be set up without ediff-wind.el being loaded
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
48 (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
49
44872
9247dfe141e4 2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 43029
diff changeset
50 ;; 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
51 ;; 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
52 ;;;###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
53 (if (featurep 'xemacs)
92948
73a01bf5cb80 * faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92503
diff changeset
54 (progn
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
55 (defun 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
56 (when (featurep 'menubar)
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
57 (add-submenu
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
58 '("Tools") ediff-menu "OO-Browser...")
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
59 (add-submenu
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
60 '("Tools") ediff-merge-menu "OO-Browser...")
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
61 (add-submenu
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
62 '("Tools") epatch-menu "OO-Browser...")
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
63 (add-submenu
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
64 '("Tools") ediff-misc-menu "OO-Browser...")
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
65 (add-menu-button
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 '("Tools") "-------" "OO-Browser...")
92951
5a094feef463 Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92948
diff changeset
67 ))
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
68 (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
69 '("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
70 ["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
71 ["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
72 ["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
73 ["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
74 "---"
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 ["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
76 ["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
77 "---"
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 ["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
79 ["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
80 "---"
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 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
82 ["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
83 "---"
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 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
85 ["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
86 ))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
87 (defvar 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
88 '("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
89 ["Files..." ediff-merge-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
90 ["Files with Ancestor..." ediff-merge-files-with-ancestor 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
91 ["Buffers..." ediff-merge-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
92 ["Buffers with Ancestor..."
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
93 ediff-merge-buffers-with-ancestor 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
94 "---"
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
95 ["Directories..." ediff-merge-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
96 ["Directories with Ancestor..."
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
97 ediff-merge-directories-with-ancestor 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
98 "---"
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
99 ["Revisions..." ediff-merge-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
100 ["Revisions with Ancestor..."
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
101 ediff-merge-revisions-with-ancestor 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
102 ["Directory Revisions..." ediff-merge-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
103 ["Directory Revisions with Ancestor..."
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 ediff-merge-directory-revisions-with-ancestor 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
105 ))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
106 (defvar 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
107 '("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
108 ["To a file..." ediff-patch-file 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
109 ["To a buffer..." ediff-patch-buffer 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
110 ))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
111 (defvar 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
112 '("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
113 ["Ediff Manual" ediff-documentation 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
114 ["Customize Ediff" ediff-customize 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
115 ["List Ediff Sessions" ediff-show-registry 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
116 ["Use separate frame for Ediff control buffer"
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
117 ediff-toggle-multiframe
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
118 :style toggle
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
119 :selected (if (and (featurep 'ediff-util)
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
120 (boundp 'ediff-window-setup-function))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
121 (eq ediff-window-setup-function
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
122 'ediff-setup-windows-multiframe))]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
123 ["Use a toolbar with Ediff control buffer"
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
124 ediff-toggle-use-toolbar
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
125 :style toggle
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
126 :selected (if (featurep 'ediff-tbar)
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 (ediff-use-toolbar-p))]))
49588
37645a051842 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 47543
diff changeset
128
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
129 ;; 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
130 (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
131 (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
132 (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
133 ;; 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
134 ;; 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
135 (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
136 (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
137 (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
138 (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
139 (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
140 (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
141 (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
142 (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
143 (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
144 (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
145 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
146
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
147 ;; define 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
148 (define-key menu-bar-ediff-menu [window]
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 '("This Window and Next Window" . compare-windows))
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 [ediff-windows-linewise]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
151 '("Windows Line-by-line..." . ediff-windows-linewise))
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-wordwise]
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 '("Windows Word-by-word..." . ediff-windows-wordwise))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
154 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
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-regions-linewise]
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 '("Regions Line-by-line..." . ediff-regions-linewise))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
157 (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
158 '("Regions Word-by-word..." . ediff-regions-wordwise))
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 [separator-ediff-regions] '("--"))
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-dir-revision]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
161 '("Directory Revisions..." . ediff-directory-revisions))
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-revision]
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 '("File with Revision..." . ediff-revision))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
164 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
165 (define-key menu-bar-ediff-menu [ediff-directories3]
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 '("Three Directories..." . ediff-directories3))
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-directories]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
168 '("Two Directories..." . ediff-directories))
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 [separator-ediff-files] '("--"))
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-buffers3]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
171 '("Three Buffers..." . ediff-buffers3))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
172 (define-key menu-bar-ediff-menu [ediff-files3]
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 '("Three Files..." . ediff-files3))
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-buffers]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
175 '("Two Buffers..." . ediff-buffers))
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-files]
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 '("Two Files..." . ediff-files))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
178
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
179 ;; define 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
180 (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
181 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
182 '("Directory Revisions with Ancestor..."
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 . ediff-merge-directory-revisions-with-ancestor))
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
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
185 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
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 '("Directory Revisions..." . ediff-merge-directory-revisions))
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
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
188 menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
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 '("Revisions with Ancestor..."
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 . ediff-merge-revisions-with-ancestor))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
191 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
192 '("Revisions..." . ediff-merge-revisions))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
193 (define-key menu-bar-ediff-merge-menu [separator-ediff-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
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-directories-with-ancestor]
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 '("Directories with Ancestor..."
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
197 . ediff-merge-directories-with-ancestor))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
198 (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
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 '("Directories..." . ediff-merge-directories))
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 [separator-ediff-merge-dirs] '("--"))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
202 (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
203 menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
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 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
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 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
206 '("Buffers..." . ediff-merge-buffers))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
207 (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
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 '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
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-files]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
210 '("Files..." . ediff-merge-files))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
211
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 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
213 (define-key menu-bar-epatch-menu [ediff-patch-buffer]
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 '("To a Buffer..." . ediff-patch-buffer))
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
215 (define-key menu-bar-epatch-menu [ediff-patch-file]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
216 '("To a File..." . ediff-patch-file))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16766
diff changeset
217
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 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
219 (define-key menu-bar-ediff-misc-menu [emultiframe]
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 '("Toggle use of separate control buffer frame"
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 . ediff-toggle-multiframe))
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 menu-bar-ediff-misc-menu [eregistry]
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 '("List Ediff Sessions" . ediff-show-registry))
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 (define-key menu-bar-ediff-misc-menu [ediff-cust]
b3aa17396fef Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Glenn Morris <rgm@gnu.org>
parents: 92493
diff changeset
225 '("Customize Ediff" . ediff-customize))
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-misc-menu [ediff-doc]
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 '("Ediff Manual" . ediff-documentation)))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
228
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
229 (provide 'ediff-hook)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
230
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49588
diff changeset
231 ;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
232 ;;; ediff-hook.el ends here