Mercurial > emacs
annotate lisp/ediff-hook.el @ 80699:2ba6b3010dbe
(holiday-julian): Fix a problem with holidays in the last fortnight in
Julian October (sync from trunk 2008-03-31).
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sun, 10 Aug 2008 20:05:45 +0000 |
parents | 73661ddc7ac7 |
children | 107ccd98fa12 |
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, |
79721 | 4 ;; 2004, 2005, 2006, 2007, 2008 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 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
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 | 13 ;; any later version. |
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 | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
13130 | 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 | 27 ;;; Code: |
13130 | 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 | 30 ;; |
18054 | 31 ;; (define-key menu-bar-tools-menu [ediff-misc] |
32 ;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu)) | |
13130 | 33 ;; (define-key menu-bar-tools-menu [epatch] |
34 ;; '("Apply Patch" . menu-bar-epatch-menu)) | |
35 ;; (define-key menu-bar-tools-menu [ediff-merge] | |
36 ;; '("Merge" . menu-bar-ediff-merge-menu)) | |
37 ;; (define-key menu-bar-tools-menu [ediff] | |
38 ;; '("Compare" . menu-bar-ediff-menu)) | |
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 | 44 (defvar ediff-misc-menu) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
45 ;; end pacifier |
13130 | 46 |
18054 | 47 ;; allow menus to be set up without ediff-wind.el being loaded |
47520
a37b476e1aec
2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
45034
diff
changeset
|
48 ;;;###autoload |
18054 | 49 (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
|
50 |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
51 ;; This macro is used to avoid compilation warnings. |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
52 ;; The macro will expand into the form that is appropriate to the |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
53 ;; compiler at hand (emacs or xemacs). |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
54 ;; The autoload, below, is useless in Emacs because ediff-hook.el |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
55 ;; is dumped with emacs, but it is needed in XEmacs |
47543
be6ae2adff50
(ediff-cond-compile-for-xemacs-or-emacs): Put the
Richard M. Stallman <rms@gnu.org>
parents:
47520
diff
changeset
|
56 ;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form)) |
be6ae2adff50
(ediff-cond-compile-for-xemacs-or-emacs): Put the
Richard M. Stallman <rms@gnu.org>
parents:
47520
diff
changeset
|
57 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
58 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
59 (if (string-match "XEmacs" emacs-version) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
60 xemacs-form emacs-form)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
61 |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
62 ;; 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
|
63 ;; 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
|
64 ;;;###autoload |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
65 (ediff-cond-compile-for-xemacs-or-emacs |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
66 ;; xemacs form |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
67 (defun ediff-xemacs-init-menus () |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
68 (if (featurep 'menubar) |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
69 (progn |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
70 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
71 '("Tools") ediff-menu "OO-Browser...") |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
72 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
73 '("Tools") ediff-merge-menu "OO-Browser...") |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
74 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
75 '("Tools") epatch-menu "OO-Browser...") |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
76 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
77 '("Tools") ediff-misc-menu "OO-Browser...") |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
78 (add-menu-button |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
79 '("Tools") "-------" "OO-Browser...") |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
80 ))) |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
81 nil ; emacs form |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
82 ) |
13130 | 83 |
84 | |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
85 ;; 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
|
86 ;; 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
|
87 ;;;###autoload |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
88 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
89 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
90 (defvar ediff-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
91 '("Compare" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
92 ["Two Files..." ediff-files t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
93 ["Two Buffers..." ediff-buffers t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
94 ["Three Files..." ediff-files3 t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
95 ["Three Buffers..." ediff-buffers3 t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
96 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
97 ["Two Directories..." ediff-directories t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
98 ["Three Directories..." ediff-directories3 t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
99 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
100 ["File with Revision..." ediff-revision t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
101 ["Directory Revisions..." ediff-directory-revisions t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
102 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
103 ["Windows Word-by-word..." ediff-windows-wordwise t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
104 ["Windows Line-by-line..." ediff-windows-linewise t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
105 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
106 ["Regions Word-by-word..." ediff-regions-wordwise t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
107 ["Regions Line-by-line..." ediff-regions-linewise t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
108 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
109 (defvar ediff-merge-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
110 '("Merge" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
111 ["Files..." ediff-merge-files t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
112 ["Files with Ancestor..." ediff-merge-files-with-ancestor t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
113 ["Buffers..." ediff-merge-buffers t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
114 ["Buffers with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
115 ediff-merge-buffers-with-ancestor t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
116 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
117 ["Directories..." ediff-merge-directories t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
118 ["Directories with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
119 ediff-merge-directories-with-ancestor t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
120 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
121 ["Revisions..." ediff-merge-revisions t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
122 ["Revisions with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
123 ediff-merge-revisions-with-ancestor t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
124 ["Directory Revisions..." ediff-merge-directory-revisions t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
125 ["Directory Revisions with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
126 ediff-merge-directory-revisions-with-ancestor t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
127 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
128 (defvar epatch-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
129 '("Apply Patch" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
130 ["To a file..." ediff-patch-file t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
131 ["To a buffer..." ediff-patch-buffer t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
132 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
133 (defvar ediff-misc-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
134 '("Ediff Miscellanea" |
61026
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
135 ["Ediff Manual" ediff-documentation t] |
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
136 ["Customize Ediff" ediff-customize t] |
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
137 ["List Ediff Sessions" ediff-show-registry t] |
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
138 ["Use separate frame for Ediff control buffer" |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
139 ediff-toggle-multiframe |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
140 :style toggle |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
141 :selected (if (and (featurep 'ediff-util) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
142 (boundp 'ediff-window-setup-function)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
143 (eq ediff-window-setup-function |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
144 'ediff-setup-windows-multiframe))] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
145 ["Use a toolbar with Ediff control buffer" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
146 ediff-toggle-use-toolbar |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
147 :style toggle |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
148 :selected (if (featurep 'ediff-tbar) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
149 (ediff-use-toolbar-p))] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
150 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
151 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
152 ;; put these menus before Object-Oriented-Browser in Tools menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
153 (if (and (featurep 'menubar) (not (featurep 'infodock)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
154 (not (featurep 'ediff-hook))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
155 (ediff-xemacs-init-menus))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
156 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
157 ;; Emacs--only if menu-bar is loaded |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
158 (if (featurep 'menu-bar) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
159 (progn |
13130 | 160 ;; initialize menu bar keymaps |
18054 | 161 (defvar menu-bar-ediff-misc-menu |
162 (make-sparse-keymap "Ediff Miscellanea")) | |
163 (fset 'menu-bar-ediff-misc-menu | |
164 (symbol-value 'menu-bar-ediff-misc-menu)) | |
13608
0f665b0b653f
(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents:
13606
diff
changeset
|
165 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
13130 | 166 (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
13608
0f665b0b653f
(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents:
13606
diff
changeset
|
167 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
168 (fset 'menu-bar-ediff-merge-menu |
13130 | 169 (symbol-value 'menu-bar-ediff-merge-menu)) |
13608
0f665b0b653f
(menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents:
13606
diff
changeset
|
170 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
13130 | 171 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
172 | |
173 ;; define ediff-menu | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
174 (define-key menu-bar-ediff-menu [window] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
175 '("This Window and Next Window" . compare-windows)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
176 (define-key menu-bar-ediff-menu [ediff-windows-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
177 '("Windows Line-by-line..." . ediff-windows-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
178 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
179 '("Windows Word-by-word..." . ediff-windows-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
180 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
181 (define-key menu-bar-ediff-menu [ediff-regions-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
182 '("Regions Line-by-line..." . ediff-regions-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
183 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
184 '("Regions Word-by-word..." . ediff-regions-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
185 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) |
13130 | 186 (define-key menu-bar-ediff-menu [ediff-dir-revision] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
187 '("Directory Revisions..." . ediff-directory-revisions)) |
13130 | 188 (define-key menu-bar-ediff-menu [ediff-revision] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
189 '("File with Revision..." . ediff-revision)) |
13130 | 190 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
191 (define-key menu-bar-ediff-menu [ediff-directories3] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
192 '("Three Directories..." . ediff-directories3)) |
13130 | 193 (define-key menu-bar-ediff-menu [ediff-directories] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
194 '("Two Directories..." . ediff-directories)) |
13130 | 195 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
196 (define-key menu-bar-ediff-menu [ediff-buffers3] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
197 '("Three Buffers..." . ediff-buffers3)) |
13130 | 198 (define-key menu-bar-ediff-menu [ediff-files3] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
199 '("Three Files..." . ediff-files3)) |
13130 | 200 (define-key menu-bar-ediff-menu [ediff-buffers] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
201 '("Two Buffers..." . ediff-buffers)) |
13130 | 202 (define-key menu-bar-ediff-menu [ediff-files] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
203 '("Two Files..." . ediff-files)) |
13130 | 204 |
205 ;; define merge menu | |
206 (define-key | |
207 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
208 '("Directory Revisions with Ancestor..." |
13130 | 209 . ediff-merge-directory-revisions-with-ancestor)) |
210 (define-key | |
211 menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
212 '("Directory Revisions..." . ediff-merge-directory-revisions)) |
13130 | 213 (define-key |
214 menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
215 '("Revisions with Ancestor..." |
13130 | 216 . ediff-merge-revisions-with-ancestor)) |
217 (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
218 '("Revisions..." . ediff-merge-revisions)) |
13130 | 219 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) |
220 (define-key | |
221 menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
222 '("Directories with Ancestor..." |
13130 | 223 . ediff-merge-directories-with-ancestor)) |
224 (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
225 '("Directories..." . ediff-merge-directories)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
226 (define-key |
13130 | 227 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) |
228 (define-key | |
229 menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
230 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
13130 | 231 (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
232 '("Buffers..." . ediff-merge-buffers)) |
13130 | 233 (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
234 '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
13130 | 235 (define-key menu-bar-ediff-merge-menu [ediff-merge-files] |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
236 '("Files..." . ediff-merge-files)) |
13130 | 237 |
238 ;; define epatch menu | |
239 (define-key menu-bar-epatch-menu [ediff-patch-buffer] | |
14109
56269b443b40
Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents:
13608
diff
changeset
|
240 '("To a Buffer..." . ediff-patch-buffer)) |
13130 | 241 (define-key menu-bar-epatch-menu [ediff-patch-file] |
18054 | 242 '("To a File..." . ediff-patch-file)) |
243 | |
244 ;; define ediff miscellanea | |
245 (define-key menu-bar-ediff-misc-menu [emultiframe] | |
61026
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
246 '("Toggle use of separate control buffer frame" |
18054 | 247 . ediff-toggle-multiframe)) |
248 (define-key menu-bar-ediff-misc-menu [eregistry] | |
61026
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
249 '("List Ediff Sessions" . ediff-show-registry)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
250 (define-key menu-bar-ediff-misc-menu [ediff-cust] |
61026
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
251 '("Customize Ediff" . ediff-customize)) |
18054 | 252 (define-key menu-bar-ediff-misc-menu [ediff-doc] |
61026
4c98ba6fa47d
(menu-bar-ediff-misc-menu, ediff-misc-menu):
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
253 '("Ediff Manual" . ediff-documentation)) |
18054 | 254 ) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
255 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
256 ) ; emacs case |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
257 ) ; ediff-cond-compile-for-xemacs-or-emacs |
13130 | 258 |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
259 ;; arrange for autoloads |
13130 | 260 (if purify-flag |
261 () ; if dumping, autoloads are set up in loaddefs.el | |
262 ;; if the user decides to load this file, set up autoloads | |
263 ;; compare files and buffers | |
79272
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
264 (autoload 'ediff "ediff" "Compare two files." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
265 (autoload 'ediff-files "ediff" "Compare two files." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
266 (autoload 'ediff-buffers "ediff" "Compare two buffers." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
267 (autoload 'ebuffers "ediff" "Compare two buffers." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
268 (autoload 'ediff3 "ediff" "Compare three files." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
269 (autoload 'ediff-files3 "ediff" "Compare three files." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
270 (autoload 'ediff-buffers3 "ediff" "Compare three buffers." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
271 (autoload 'ebuffers3 "ediff" "Compare three buffers." t) |
13130 | 272 |
79272
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
273 (autoload 'erevision "ediff" "Compare versions of a file." t) |
dc9a8fab33bb
(ediff, ediff-files, ediff-buffers, ebuffers, ediff3, ediff-files3,
Juanma Barranquero <lekktu@gmail.com>
parents:
78236
diff
changeset
|
274 (autoload 'ediff-revision "ediff" "Compare versions of a file." t) |
13130 | 275 |
276 ;; compare regions and windows | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
277 (autoload 'ediff-windows-wordwise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
278 "ediff" "Compare two windows word-by-word." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
279 (autoload 'ediff-regions-wordwise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
280 "ediff" "Compare two regions word-by-word." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
281 (autoload 'ediff-windows-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
282 "ediff" "Compare two windows line-by-line." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
283 (autoload 'ediff-regions-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
284 "ediff" "Compare two regions line-by-line." t) |
13130 | 285 |
286 ;; patch | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
287 (autoload 'ediff-patch-file "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
288 (autoload 'epatch "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
289 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.") |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
290 (autoload 'epatch-buffer "ediff" "Patch a buffer." t) |
13130 | 291 |
292 ;; merge | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
293 (autoload 'ediff-merge "ediff" "Merge two files." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
294 (autoload 'ediff-merge-files "ediff" "Merge two files." t) |
13130 | 295 (autoload 'ediff-merge-files-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
296 "ediff" "Merge two files using a third file as an ancestor." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
297 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t) |
13130 | 298 (autoload 'ediff-merge-buffers-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
299 "ediff" "Merge two buffers using a third buffer as an ancestor." t) |
13130 | 300 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
301 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t) |
13130 | 302 (autoload 'ediff-merge-revisions-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
303 "ediff" "Merge two versions of a file." t) |
13130 | 304 |
305 ;; compare directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
306 (autoload 'edirs "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
307 (autoload 'ediff-directories "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
308 (autoload 'edirs3 "ediff" "Compare files in three directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
309 (autoload |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
310 'ediff-directories3 "ediff" "Compare files in three directories." t) |
13130 | 311 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
312 (autoload 'edir-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
313 "ediff" "Compare two versions of a file." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
314 (autoload 'ediff-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
315 "ediff" "Compare two versions of a file." t) |
13130 | 316 |
317 ;; merge directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
318 (autoload 'edirs-merge "ediff" "Merge files in two directories." t) |
13130 | 319 (autoload 'ediff-merge-directories |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
320 "ediff" "Merge files in two directories." t) |
13130 | 321 (autoload 'edirs-merge-with-ancestor |
322 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
323 "Merge files in two directories using files in a third dir as ancestors." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
324 t) |
13130 | 325 (autoload 'ediff-merge-directories-with-ancestor |
326 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
327 "Merge files in two directories using files in a third dir as ancestors." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
328 t) |
13130 | 329 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
330 (autoload 'edir-merge-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
331 "ediff" "Merge versions of files in a directory." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
332 (autoload 'ediff-merge-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
333 "ediff" "Merge versions of files in a directory." t) |
13130 | 334 (autoload 'ediff-merge-directory-revisions-with-ancestor |
335 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
336 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 337 t) |
338 (autoload 'edir-merge-revisions-with-ancestor | |
339 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
340 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 341 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
342 |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
343 ;; misc |
13130 | 344 (autoload 'ediff-show-registry |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
345 "ediff-mult" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
346 "Display the registry of active Ediff sessions." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
347 t) |
18839 | 348 (autoload 'eregistry |
349 "ediff-mult" | |
350 "Display the registry of active Ediff sessions." | |
351 t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
352 (autoload 'ediff-documentation |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
353 "ediff" |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
354 "Display Ediff's manual." |
13130 | 355 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
356 (autoload 'ediff-version |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
357 "ediff" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
358 "Show Ediff's version and last modification date." |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
359 t) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
360 (autoload 'ediff-toggle-multiframe |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
361 "ediff-util" |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
362 "Toggle the use of separate frame for Ediff control buffer." |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
363 t) |
18054 | 364 (autoload 'ediff-toggle-use-toolbar |
365 "ediff-util" | |
366 "Toggle the use of Ediff toolbar." | |
367 t) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
368 |
13130 | 369 ) ; if purify-flag |
370 | |
371 | |
372 (provide 'ediff-hook) | |
373 | |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
374 |
52401 | 375 ;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3 |
13130 | 376 ;;; ediff-hook.el ends here |