Mercurial > emacs
annotate lisp/ediff-hook.el @ 49968:80ed3e75ba10
(read-envvar-name): Decode names.
(substitute-env-vars): Use eval-when-compile and char class.
(setenv): Doc fix. Encode the data (after checking that's
possible).
(getenv): Encode the name and decode the result.
author | Dave Love <fx@gnu.org> |
---|---|
date | Mon, 24 Feb 2003 22:51:41 +0000 |
parents | 37645a051842 |
children | 695cf19ef79e d7ddb3e565de |
rev | line source |
---|---|
13130 | 1 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads |
14169 | 2 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
3 ;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. |
13130 | 4 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
13130 | 6 |
7 ;; This file is part of GNU Emacs. | |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
12 ;; any later version. | |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
13130 | 23 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
35411
diff
changeset
|
24 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
35411
diff
changeset
|
25 |
14169 | 26 ;;; Code: |
13130 | 27 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
28 ;;; These must be placed in menu-bar.el in Emacs |
13130 | 29 ;; |
18054 | 30 ;; (define-key menu-bar-tools-menu [ediff-misc] |
31 ;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu)) | |
13130 | 32 ;; (define-key menu-bar-tools-menu [epatch] |
33 ;; '("Apply Patch" . menu-bar-epatch-menu)) | |
34 ;; (define-key menu-bar-tools-menu [ediff-merge] | |
35 ;; '("Merge" . menu-bar-ediff-merge-menu)) | |
36 ;; (define-key menu-bar-tools-menu [ediff] | |
37 ;; '("Compare" . menu-bar-ediff-menu)) | |
38 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
39 ;; Compiler pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
40 (defvar ediff-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
41 (defvar ediff-merge-menu) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
42 (defvar epatch-menu) |
18054 | 43 (defvar ediff-misc-menu) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
44 ;; end pacifier |
13130 | 45 |
18054 | 46 ;; allow menus to be set up without ediff-wind.el being loaded |
47520
a37b476e1aec
2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
45034
diff
changeset
|
47 ;;;###autoload |
18054 | 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 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
|
51 ;; 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
|
52 ;; 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
|
53 ;; 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
|
54 ;; 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
|
55 ;;;###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
|
56 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
57 (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
|
58 (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
|
59 xemacs-form emacs-form)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
60 |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
61 ;; 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
|
62 ;; 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
|
63 ;;;###autoload |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
64 (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
|
65 ;; xemacs form |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
66 (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
|
67 (if (featurep 'menubar) |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
68 (progn |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
69 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
70 '("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
|
71 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
72 '("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
|
73 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
74 '("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
|
75 (add-submenu |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
76 '("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
|
77 (add-menu-button |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
78 '("Tools") "-------" "OO-Browser...") |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
79 ))) |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
80 nil ; emacs form |
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
81 ) |
13130 | 82 |
83 | |
44872
9247dfe141e4
2002-04-25 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43029
diff
changeset
|
84 ;; 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
|
85 ;; 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
|
86 ;;;###autoload |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
87 (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
|
88 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
89 (defvar ediff-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
90 '("Compare" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
91 ["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
|
92 ["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
|
93 ["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
|
94 ["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
|
95 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
96 ["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
|
97 ["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
|
98 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
99 ["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
|
100 ["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
|
101 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
102 ["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
|
103 ["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
|
104 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
105 ["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
|
106 ["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
|
107 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
108 (defvar ediff-merge-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
109 '("Merge" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
110 ["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
|
111 ["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
|
112 ["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
|
113 ["Buffers with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
114 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
|
115 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
116 ["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
|
117 ["Directories with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
118 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
|
119 "---" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
120 ["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
|
121 ["Revisions with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
122 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
|
123 ["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
|
124 ["Directory Revisions with Ancestor..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
125 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
|
126 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
127 (defvar epatch-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
128 '("Apply Patch" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
129 ["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
|
130 ["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
|
131 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
132 (defvar ediff-misc-menu |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
133 '("Ediff Miscellanea" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
134 ["Ediff Manual..." ediff-documentation t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
135 ["Customize Ediff..." ediff-customize t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
136 ["List Ediff Sessions..." ediff-show-registry t] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
137 ["Use separate frame for Ediff control buffer..." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
138 ediff-toggle-multiframe |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
139 :style toggle |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
140 :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
|
141 (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
|
142 (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
|
143 'ediff-setup-windows-multiframe))] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
144 ["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
|
145 ediff-toggle-use-toolbar |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
146 :style toggle |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
147 :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
|
148 (ediff-use-toolbar-p))] |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
149 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
150 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
151 ;; 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
|
152 (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
|
153 (not (featurep 'ediff-hook))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
154 (ediff-xemacs-init-menus))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
155 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
156 ;; 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
|
157 (if (featurep 'menu-bar) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
158 (progn |
13130 | 159 ;; initialize menu bar keymaps |
18054 | 160 (defvar menu-bar-ediff-misc-menu |
161 (make-sparse-keymap "Ediff Miscellanea")) | |
162 (fset 'menu-bar-ediff-misc-menu | |
163 (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
|
164 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
13130 | 165 (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
|
166 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
167 (fset 'menu-bar-ediff-merge-menu |
13130 | 168 (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
|
169 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
13130 | 170 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
171 | |
172 ;; define ediff-menu | |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
173 (define-key menu-bar-ediff-menu [window] |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
174 '("This Window and Next Window" . compare-windows)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
175 (define-key menu-bar-ediff-menu [ediff-windows-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
176 '("Windows Line-by-line..." . ediff-windows-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
177 (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
178 '("Windows Word-by-word..." . ediff-windows-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
179 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
180 (define-key menu-bar-ediff-menu [ediff-regions-linewise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
181 '("Regions Line-by-line..." . ediff-regions-linewise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
182 (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
183 '("Regions Word-by-word..." . ediff-regions-wordwise)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
184 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) |
13130 | 185 (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
|
186 '("Directory Revisions..." . ediff-directory-revisions)) |
13130 | 187 (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
|
188 '("File with Revision..." . ediff-revision)) |
13130 | 189 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
190 (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
|
191 '("Three Directories..." . ediff-directories3)) |
13130 | 192 (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
|
193 '("Two Directories..." . ediff-directories)) |
13130 | 194 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
195 (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
|
196 '("Three Buffers..." . ediff-buffers3)) |
13130 | 197 (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
|
198 '("Three Files..." . ediff-files3)) |
13130 | 199 (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
|
200 '("Two Buffers..." . ediff-buffers)) |
13130 | 201 (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
|
202 '("Two Files..." . ediff-files)) |
13130 | 203 |
204 ;; define merge menu | |
205 (define-key | |
206 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
|
207 '("Directory Revisions with Ancestor..." |
13130 | 208 . ediff-merge-directory-revisions-with-ancestor)) |
209 (define-key | |
210 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
|
211 '("Directory Revisions..." . ediff-merge-directory-revisions)) |
13130 | 212 (define-key |
213 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
|
214 '("Revisions with Ancestor..." |
13130 | 215 . ediff-merge-revisions-with-ancestor)) |
216 (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
|
217 '("Revisions..." . ediff-merge-revisions)) |
13130 | 218 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) |
219 (define-key | |
220 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
|
221 '("Directories with Ancestor..." |
13130 | 222 . ediff-merge-directories-with-ancestor)) |
223 (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
|
224 '("Directories..." . ediff-merge-directories)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
225 (define-key |
13130 | 226 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) |
227 (define-key | |
228 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
|
229 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
13130 | 230 (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
|
231 '("Buffers..." . ediff-merge-buffers)) |
13130 | 232 (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
|
233 '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
13130 | 234 (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
|
235 '("Files..." . ediff-merge-files)) |
13130 | 236 |
237 ;; define epatch menu | |
238 (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
|
239 '("To a Buffer..." . ediff-patch-buffer)) |
13130 | 240 (define-key menu-bar-epatch-menu [ediff-patch-file] |
18054 | 241 '("To a File..." . ediff-patch-file)) |
242 | |
243 ;; define ediff miscellanea | |
244 (define-key menu-bar-ediff-misc-menu [emultiframe] | |
245 '("Toggle use of separate control buffer frame..." | |
246 . ediff-toggle-multiframe)) | |
247 (define-key menu-bar-ediff-misc-menu [eregistry] | |
248 '("List Ediff Sessions..." . ediff-show-registry)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
249 (define-key menu-bar-ediff-misc-menu [ediff-cust] |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
250 '("Customize Ediff..." . ediff-customize)) |
18054 | 251 (define-key menu-bar-ediff-misc-menu [ediff-doc] |
252 '("Ediff Manual..." . ediff-documentation)) | |
253 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
254 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
255 ) ; emacs case |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
256 ) ; ediff-cond-compile-for-xemacs-or-emacs |
13130 | 257 |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
258 ;; arrange for autoloads |
13130 | 259 (if purify-flag |
260 () ; if dumping, autoloads are set up in loaddefs.el | |
261 ;; if the user decides to load this file, set up autoloads | |
262 ;; compare files and buffers | |
263 (autoload 'ediff "ediff" "Compare two files" t) | |
264 (autoload 'ediff-files "ediff" "Compare two files" t) | |
265 (autoload 'ediff-buffers "ediff" "Compare two bufers" t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
266 (autoload 'ebuffers "ediff" "Compare two bufers" t) |
13130 | 267 (autoload 'ediff3 "ediff" "Compare three files" t) |
268 (autoload 'ediff-files3 "ediff" "Compare three files" t) | |
269 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
270 (autoload 'ebuffers3 "ediff" "Compare three bufers" t) |
13130 | 271 |
18839 | 272 (autoload 'erevision "ediff" "Compare versions of a file" t) |
13130 | 273 (autoload 'ediff-revision "ediff" "Compare versions of a file" t) |
274 | |
275 ;; compare regions and windows | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
276 (autoload 'ediff-windows-wordwise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
277 "ediff" "Compare two windows word-by-word." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
278 (autoload 'ediff-regions-wordwise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
279 "ediff" "Compare two regions word-by-word." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
280 (autoload 'ediff-windows-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
281 "ediff" "Compare two windows line-by-line." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
282 (autoload 'ediff-regions-linewise |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
283 "ediff" "Compare two regions line-by-line." t) |
13130 | 284 |
285 ;; patch | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
286 (autoload 'ediff-patch-file "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
287 (autoload 'epatch "ediff" "Patch a file." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
288 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.") |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
289 (autoload 'epatch-buffer "ediff" "Patch a buffer." t) |
13130 | 290 |
291 ;; merge | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
292 (autoload 'ediff-merge "ediff" "Merge two files." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
293 (autoload 'ediff-merge-files "ediff" "Merge two files." t) |
13130 | 294 (autoload 'ediff-merge-files-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
295 "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
|
296 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t) |
13130 | 297 (autoload 'ediff-merge-buffers-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
298 "ediff" "Merge two buffers using a third buffer as an ancestor." t) |
13130 | 299 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
300 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t) |
13130 | 301 (autoload 'ediff-merge-revisions-with-ancestor |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
302 "ediff" "Merge two versions of a file." t) |
13130 | 303 |
304 ;; compare directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
305 (autoload 'edirs "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
306 (autoload 'ediff-directories "ediff" "Compare files in two directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
307 (autoload 'edirs3 "ediff" "Compare files in three directories." t) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
308 (autoload |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
309 'ediff-directories3 "ediff" "Compare files in three directories." t) |
13130 | 310 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
311 (autoload 'edir-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
312 "ediff" "Compare two versions of a file." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
313 (autoload 'ediff-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
314 "ediff" "Compare two versions of a file." t) |
13130 | 315 |
316 ;; merge directories | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
317 (autoload 'edirs-merge "ediff" "Merge files in two directories." t) |
13130 | 318 (autoload 'ediff-merge-directories |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
319 "ediff" "Merge files in two directories." t) |
13130 | 320 (autoload 'edirs-merge-with-ancestor |
321 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
322 "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
|
323 t) |
13130 | 324 (autoload 'ediff-merge-directories-with-ancestor |
325 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
326 "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
|
327 t) |
13130 | 328 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
329 (autoload 'edir-merge-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
330 "ediff" "Merge versions of files in a directory." t) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
331 (autoload 'ediff-merge-directory-revisions |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
332 "ediff" "Merge versions of files in a directory." t) |
13130 | 333 (autoload 'ediff-merge-directory-revisions-with-ancestor |
334 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
335 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 336 t) |
337 (autoload 'edir-merge-revisions-with-ancestor | |
338 "ediff" | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
339 "Merge versions of files in a directory using other versions as ancestors." |
13130 | 340 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
341 |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
342 ;; misc |
13130 | 343 (autoload 'ediff-show-registry |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
344 "ediff-mult" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
345 "Display the registry of active Ediff sessions." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
346 t) |
18839 | 347 (autoload 'eregistry |
348 "ediff-mult" | |
349 "Display the registry of active Ediff sessions." | |
350 t) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
351 (autoload 'ediff-documentation |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
352 "ediff" |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
353 "Display Ediff's manual." |
13130 | 354 t) |
13215
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
355 (autoload 'ediff-version |
e0ee1eaaabc5
Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13130
diff
changeset
|
356 "ediff" |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
357 "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
|
358 t) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
359 (autoload 'ediff-toggle-multiframe |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
360 "ediff-util" |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
361 "Toggle the use of separate frame for Ediff control buffer." |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
362 t) |
18054 | 363 (autoload 'ediff-toggle-use-toolbar |
364 "ediff-util" | |
365 "Toggle the use of Ediff toolbar." | |
366 t) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47543
diff
changeset
|
367 |
13130 | 368 ) ; if purify-flag |
369 | |
370 | |
371 (provide 'ediff-hook) | |
372 | |
373 ;;; ediff-hook.el ends here |