annotate lisp/ediff-hook.el @ 15222:cc264dd966cd

(Fmsdos_downcase_filename): Don't change the argument, return a copy.
author Richard M. Stallman <rms@gnu.org>
date Sun, 12 May 1996 17:45:36 +0000
parents c768f6d7daaa
children 43a3308fcf61
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
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14109
diff changeset
3 ;; Copyright (C) 1995 Free Software Foundation, Inc.
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
4
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
6
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
8
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
12 ;; any later version.
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
13
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
17 ;; GNU General Public License for more details.
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
18
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
19 ;; 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
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14109
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14109
diff changeset
22 ;; Boston, MA 02111-1307, USA.
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
23
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14109
diff changeset
24 ;;; Code:
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
25
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
26 ;;; These must be placed in menu-bar.el in Emacs
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
27 ;;
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
28 ;; (define-key menu-bar-tools-menu [ediff-doc]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
29 ;; '("Ediff Manual..." . ediff-documentation))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
30 ;; (define-key menu-bar-tools-menu [eregistry]
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
31 ;; '("List Ediff Sessions..." . ediff-show-registry))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
32 ;; (define-key menu-bar-tools-menu [epatch]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
33 ;; '("Apply Patch" . menu-bar-epatch-menu))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
34 ;; (define-key menu-bar-tools-menu [ediff-merge]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
35 ;; '("Merge" . menu-bar-ediff-merge-menu))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
36 ;; (define-key menu-bar-tools-menu [ediff]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
37 ;; '("Compare" . menu-bar-ediff-menu))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
38
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
39
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
40 (defun ediff-xemacs-init-menus ()
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
41 (if (featurep 'menubar)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
42 (progn
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
43 (add-submenu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
44 '("Tools") ediff-menu "OO-Browser...")
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
45 (add-submenu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
46 '("Tools") ediff-merge-menu "OO-Browser...")
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
47 (add-submenu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
48 '("Tools") epatch-menu "OO-Browser...")
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
49 (add-menu-button
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
50 '("Tools")
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
51 ["List Ediff Sessions..." ediff-show-registry t] "OO-Browser...")
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
52 (add-menu-button
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
53 '("Tools")
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
54 ["Ediff Manual..." ediff-documentation t] "OO-Browser...")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
55 (add-menu-button
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
56 '("Tools")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
57 ["-------" nil nil] "OO-Browser...")
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
58 )))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
59
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
60
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
61 ;; explicit string-match is needed: ediff-xemacs-p is not defined at build time
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
62 (cond ((string-match "XEmacs" emacs-version)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
63 (defvar ediff-menu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
64 '("Compare"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
65 ["Two Files..." ediff-files t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
66 ["Two Buffers..." ediff-buffers t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
67 ["Three Files..." ediff-files3 t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
68 ["Three Buffers..." ediff-buffers3 t]
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
69 "---"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
70 ["Two Directories..." ediff-directories t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
71 ["Three Directories..." ediff-directories3 t]
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
72 "---"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
73 ["File with Revision..." ediff-revision t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
74 ["Directory Revisions..." ediff-directory-revisions t]
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
75 "---"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
76 ["Windows Word-by-word..." ediff-windows-wordwise t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
77 ["Windows Line-by-line..." ediff-windows-linewise t]
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
78 "---"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
79 ["Regions Word-by-word..." ediff-regions-wordwise t]
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
80 ["Regions Line-by-line..." ediff-regions-linewise t]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
81 ))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
82 (defvar ediff-merge-menu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
83 '("Merge"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
84 ["Files..." ediff-merge-files t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
85 ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
86 ["Buffers..." ediff-merge-buffers t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
87 ["Buffers with Ancestor..."
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
88 ediff-merge-buffers-with-ancestor t]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
89 "---"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
90 ["Directories..." ediff-merge-directories t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
91 ["Directories with Ancestor..."
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
92 ediff-merge-directories-with-ancestor t]
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
93 "---"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
94 ["Revisions..." ediff-merge-revisions t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
95 ["Revisions with Ancestor..."
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
96 ediff-merge-revisions-with-ancestor t]
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
97 ["Directory Revisions..." ediff-merge-directory-revisions t]
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
98 ["Directory Revisions with Ancestor..."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
99 ediff-merge-directory-revisions-with-ancestor t]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
100 ))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
101 (defvar epatch-menu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
102 '("Apply Patch"
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
103 ["To a file..." ediff-patch-file t]
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
104 ["To a buffer..." ediff-patch-buffer t]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
105 ))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
106
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
107 ;; put these menus before Object-Oriented-Browser in Tools menu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
108 (add-hook 'before-init-hook 'ediff-xemacs-init-menus)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
109 (if (not purify-flag)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
110 (ediff-xemacs-init-menus))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
111 )
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
112
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
113 ;; Emacs--only if menu-bar is loaded
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
114 ((featurep 'menu-bar)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
115 ;; initialize menu bar keymaps
13608
0f665b0b653f (menu-bar-epatch-menu, menu-bar-ediff-merge-menu)
Richard M. Stallman <rms@gnu.org>
parents: 13606
diff changeset
116 (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
117 (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
118 (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
119 (fset 'menu-bar-ediff-merge-menu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
120 (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
121 (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
122 (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
123
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
124 ;; define ediff-menu
13215
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
125 (define-key menu-bar-ediff-menu [window]
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
126 '("This Window and Next Window" . compare-windows))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
127 (define-key menu-bar-ediff-menu [ediff-windows-linewise]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
128 '("Windows Line-by-line..." . ediff-windows-linewise))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
129 (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
130 '("Windows Word-by-word..." . ediff-windows-wordwise))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
131 (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
132 (define-key menu-bar-ediff-menu [ediff-regions-linewise]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
133 '("Regions Line-by-line..." . ediff-regions-linewise))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
134 (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
135 '("Regions Word-by-word..." . ediff-regions-wordwise))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
136 (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
137 (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
138 '("Directory Revisions..." . ediff-directory-revisions))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
139 (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
140 '("File with Revision..." . ediff-revision))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
141 (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
142 (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
143 '("Three Directories..." . ediff-directories3))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
144 (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
145 '("Two Directories..." . ediff-directories))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
146 (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
147 (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
148 '("Three Buffers..." . ediff-buffers3))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
149 (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
150 '("Three Files..." . ediff-files3))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
151 (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
152 '("Two Buffers..." . ediff-buffers))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
153 (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
154 '("Two Files..." . ediff-files))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
155
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
156 ;; define merge menu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
157 (define-key
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
158 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
159 '("Directory Revisions with Ancestor..."
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
160 . ediff-merge-directory-revisions-with-ancestor))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
161 (define-key
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
162 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
163 '("Directory Revisions..." . ediff-merge-directory-revisions))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
164 (define-key
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
165 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
166 '("Revisions with Ancestor..."
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
167 . ediff-merge-revisions-with-ancestor))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
168 (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
169 '("Revisions..." . ediff-merge-revisions))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
170 (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
171 (define-key
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
172 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
173 '("Directories with Ancestor..."
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
174 . ediff-merge-directories-with-ancestor))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
175 (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
176 '("Directories..." . ediff-merge-directories))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
177 (define-key
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
178 menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
179 (define-key
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
180 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
181 '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
182 (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
183 '("Buffers..." . ediff-merge-buffers))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
184 (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
185 '("Files with Ancestor..." . ediff-merge-files-with-ancestor))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
186 (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
187 '("Files..." . ediff-merge-files))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
188
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
189 ;; define epatch menu
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
190 (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
191 '("To a Buffer..." . ediff-patch-buffer))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
192 (define-key menu-bar-epatch-menu [ediff-patch-file]
14109
56269b443b40 Delete spaces before `...' in menu strings.
Karl Heuer <kwzh@gnu.org>
parents: 13608
diff changeset
193 '("To a File..." . ediff-patch-file)))
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
194
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
195 ) ; cond
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
196
13215
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
197 ;; arrange for autoloads
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
198 (if purify-flag
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
199 () ; if dumping, autoloads are set up in loaddefs.el
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
200 ;; if the user decides to load this file, set up autoloads
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
201 ;; compare files and buffers
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
202 (autoload 'ediff "ediff" "Compare two files" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
203 (autoload 'ediff-files "ediff" "Compare two files" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
204 (autoload 'ediff-buffers "ediff" "Compare two bufers" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
205 (autoload 'ediff3 "ediff" "Compare three files" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
206 (autoload 'ediff-files3 "ediff" "Compare three files" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
207 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
208
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
209 (autoload 'ediff-revision "ediff" "Compare versions of a file" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
210
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
211 ;; compare regions and windows
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
212 (autoload 'ediff-windows-wordwise
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
213 "ediff" "Compare two windows word-by-word" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
214 (autoload 'ediff-regions-wordwise
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
215 "ediff" "Compare two regions word-by-word" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
216 (autoload 'ediff-windows-linewise
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
217 "ediff" "Compare two windows line-by-line" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
218 (autoload 'ediff-regions-linewise
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
219 "ediff" "Compare two regions line-by-line" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
220
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
221 ;; patch
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
222 (autoload 'ediff-patch-file "ediff" "Patch a file" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
223 (autoload 'epatch "ediff" "Patch a file" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
224 (autoload 'ediff-patch-buffer "ediff" "Patch a buffer")
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
225 (autoload 'epatch-buffer "ediff" "Patch a buffer" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
226
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
227 ;; merge
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
228 (autoload 'ediff-merge "ediff" "Merge two files" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
229 (autoload 'ediff-merge-files "ediff" "Merge two files" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
230 (autoload 'ediff-merge-files-with-ancestor
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
231 "ediff" "Merge two files using a third file as an ancestor" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
232 (autoload 'ediff-merge-buffers "ediff" "Merge two buffers" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
233 (autoload 'ediff-merge-buffers-with-ancestor
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
234 "ediff" "Merge two buffers using a third buffer as an ancestor" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
235
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
236 (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
237 (autoload 'ediff-merge-revisions-with-ancestor
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
238 "ediff" "Merge two versions of a file" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
239
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
240 ;; compare directories
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
241 (autoload 'edirs "ediff" "Compare files in two directories" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
242 (autoload 'ediff-directories "ediff" "Compare files in two directories" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
243 (autoload 'edirs3 "ediff" "Compare files in three directories" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
244 (autoload 'ediff-directories3 "ediff" "Compare files in three directories" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
245
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
246 (autoload 'edir-revisions
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
247 "ediff" "Compare two versions of a file" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
248 (autoload 'ediff-directory-revisions
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
249 "ediff" "Compare two versions of a file" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
250
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
251 ;; merge directories
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
252 (autoload 'edirs-merge "ediff" "Merge files in two directories" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
253 (autoload 'ediff-merge-directories
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
254 "ediff" "Merge files in two directories" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
255 (autoload 'edirs-merge-with-ancestor
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
256 "ediff"
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
257 "Merge files in two directories using files in a third dir as ancestors" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
258 (autoload 'ediff-merge-directories-with-ancestor
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
259 "ediff"
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
260 "Merge files in two directories using files in a third dir as ancestors" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
261
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
262 (autoload 'edir-merge-revisions
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
263 "ediff" "Merge versions of files in a directory" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
264 (autoload 'ediff-merge-directory-revisions
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
265 "ediff" "Merge versions of files in a directory" t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
266 (autoload 'ediff-merge-directory-revisions-with-ancestor
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
267 "ediff"
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
268 "Merge versions of files in a directory using other versions as ancestors"
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
269 t)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
270 (autoload 'edir-merge-revisions-with-ancestor
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
271 "ediff"
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
272 "Merge versions of files in a directory using other versions as ancestors"
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
273 t)
13215
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
274
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
275 ;; misc
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
276 (autoload 'ediff-show-registry
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
277 "ediff-meta"
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
278 "Display the registry of active Ediff sessions"
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
279 t)
13215
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
280 (autoload 'ediff-version
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
281 "ediff"
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
282 "Show Ediff's version and last modification date"
e0ee1eaaabc5 Now defines [window] in menu-bar-ediff-menu.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13130
diff changeset
283 t)
13130
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
284 ) ; if purify-flag
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
285
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
286
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
287 (provide 'ediff-hook)
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
288
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
289
c43bacb1bd0a Initial revision
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
diff changeset
290 ;;; ediff-hook.el ends here