44 |
;; end pacifier |
;; end pacifier |
45 |
|
|
46 |
;; allow menus to be set up without ediff-wind.el being loaded |
;; allow menus to be set up without ediff-wind.el being loaded |
47 |
|
;;;###autoload |
48 |
(defvar ediff-window-setup-function) |
(defvar ediff-window-setup-function) |
49 |
|
|
50 |
;; This macro is used to avoid compilation warnings. |
;; This macro is used to avoid compilation warnings. |
52 |
;; compiler at hand (emacs or xemacs). |
;; compiler at hand (emacs or xemacs). |
53 |
;; The autoload, below, is useless in Emacs because ediff-hook.el |
;; The autoload, below, is useless in Emacs because ediff-hook.el |
54 |
;; is dumped with emacs, but it is needed in XEmacs |
;; is dumped with emacs, but it is needed in XEmacs |
55 |
|
;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form)) |
56 |
|
|
57 |
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
58 |
(if (string-match "XEmacs" emacs-version) |
(if (string-match "XEmacs" emacs-version) |
59 |
xemacs-form emacs-form)) |
xemacs-form emacs-form)) |
60 |
|
|
61 |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
62 |
;; emacs, but it is needed in XEmacs |
;; emacs, but it is needed in XEmacs |
63 |
|
;;;###autoload |
64 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
65 |
;; xemacs form |
;; xemacs form |
66 |
(defun ediff-xemacs-init-menus () |
(defun ediff-xemacs-init-menus () |
83 |
|
|
84 |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
;; This autoload is useless in Emacs because ediff-hook.el is dumped with |
85 |
;; emacs, but it is needed in XEmacs |
;; emacs, but it is needed in XEmacs |
86 |
|
;;;###autoload |
87 |
(ediff-cond-compile-for-xemacs-or-emacs |
(ediff-cond-compile-for-xemacs-or-emacs |
88 |
(progn |
(progn |
89 |
(defvar ediff-menu |
(defvar ediff-menu |
147 |
:selected (if (featurep 'ediff-tbar) |
:selected (if (featurep 'ediff-tbar) |
148 |
(ediff-use-toolbar-p))] |
(ediff-use-toolbar-p))] |
149 |
)) |
)) |
150 |
|
|
151 |
;; put these menus before Object-Oriented-Browser in Tools menu |
;; put these menus before Object-Oriented-Browser in Tools menu |
152 |
(if (and (featurep 'menubar) (not (featurep 'infodock)) |
(if (and (featurep 'menubar) (not (featurep 'infodock)) |
153 |
(not (featurep 'ediff-hook))) |
(not (featurep 'ediff-hook))) |
154 |
(ediff-xemacs-init-menus))) |
(ediff-xemacs-init-menus))) |
155 |
|
|
156 |
;; Emacs--only if menu-bar is loaded |
;; Emacs--only if menu-bar is loaded |
157 |
(if (featurep 'menu-bar) |
(if (featurep 'menu-bar) |
158 |
(progn |
(progn |
164 |
(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch")) |
165 |
(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu)) |
166 |
(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge")) |
167 |
(fset 'menu-bar-ediff-merge-menu |
(fset 'menu-bar-ediff-merge-menu |
168 |
(symbol-value 'menu-bar-ediff-merge-menu)) |
(symbol-value 'menu-bar-ediff-merge-menu)) |
169 |
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare")) |
170 |
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu)) |
222 |
. ediff-merge-directories-with-ancestor)) |
. ediff-merge-directories-with-ancestor)) |
223 |
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories] |
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories] |
224 |
'("Directories..." . ediff-merge-directories)) |
'("Directories..." . ediff-merge-directories)) |
225 |
(define-key |
(define-key |
226 |
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) |
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) |
227 |
(define-key |
(define-key |
228 |
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] |
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] |
251 |
(define-key menu-bar-ediff-misc-menu [ediff-doc] |
(define-key menu-bar-ediff-misc-menu [ediff-doc] |
252 |
'("Ediff Manual..." . ediff-documentation)) |
'("Ediff Manual..." . ediff-documentation)) |
253 |
) |
) |
254 |
|
|
255 |
) ; emacs case |
) ; emacs case |
256 |
) ; ediff-cond-compile-for-xemacs-or-emacs |
) ; ediff-cond-compile-for-xemacs-or-emacs |
257 |
|
|
273 |
(autoload 'ediff-revision "ediff" "Compare versions of a file" t) |
(autoload 'ediff-revision "ediff" "Compare versions of a file" t) |
274 |
|
|
275 |
;; compare regions and windows |
;; compare regions and windows |
276 |
(autoload 'ediff-windows-wordwise |
(autoload 'ediff-windows-wordwise |
277 |
"ediff" "Compare two windows word-by-word." t) |
"ediff" "Compare two windows word-by-word." t) |
278 |
(autoload 'ediff-regions-wordwise |
(autoload 'ediff-regions-wordwise |
279 |
"ediff" "Compare two regions word-by-word." t) |
"ediff" "Compare two regions word-by-word." t) |
280 |
(autoload 'ediff-windows-linewise |
(autoload 'ediff-windows-linewise |
281 |
"ediff" "Compare two windows line-by-line." t) |
"ediff" "Compare two windows line-by-line." t) |
282 |
(autoload 'ediff-regions-linewise |
(autoload 'ediff-regions-linewise |
283 |
"ediff" "Compare two regions line-by-line." t) |
"ediff" "Compare two regions line-by-line." t) |
284 |
|
|
285 |
;; patch |
;; patch |
308 |
(autoload |
(autoload |
309 |
'ediff-directories3 "ediff" "Compare files in three directories." t) |
'ediff-directories3 "ediff" "Compare files in three directories." t) |
310 |
|
|
311 |
(autoload 'edir-revisions |
(autoload 'edir-revisions |
312 |
"ediff" "Compare two versions of a file." t) |
"ediff" "Compare two versions of a file." t) |
313 |
(autoload 'ediff-directory-revisions |
(autoload 'ediff-directory-revisions |
314 |
"ediff" "Compare two versions of a file." t) |
"ediff" "Compare two versions of a file." t) |
315 |
|
|
316 |
;; merge directories |
;; merge directories |
326 |
"Merge files in two directories using files in a third dir as ancestors." |
"Merge files in two directories using files in a third dir as ancestors." |
327 |
t) |
t) |
328 |
|
|
329 |
(autoload 'edir-merge-revisions |
(autoload 'edir-merge-revisions |
330 |
"ediff" "Merge versions of files in a directory." t) |
"ediff" "Merge versions of files in a directory." t) |
331 |
(autoload 'ediff-merge-directory-revisions |
(autoload 'ediff-merge-directory-revisions |
332 |
"ediff" "Merge versions of files in a directory." t) |
"ediff" "Merge versions of files in a directory." t) |
333 |
(autoload 'ediff-merge-directory-revisions-with-ancestor |
(autoload 'ediff-merge-directory-revisions-with-ancestor |
334 |
"ediff" |
"ediff" |
364 |
"ediff-util" |
"ediff-util" |
365 |
"Toggle the use of Ediff toolbar." |
"Toggle the use of Ediff toolbar." |
366 |
t) |
t) |
367 |
|
|
368 |
) ; if purify-flag |
) ; if purify-flag |
369 |
|
|
370 |
|
|