2019-06-21 05:16:54 +00:00
|
|
|
;;; ediff-hook.el --- setup for Ediff's menus and autoloads -*- lexical-binding:t -*-
|
1996-01-14 07:34:30 +00:00
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
|
1995-10-06 00:57:20 +00:00
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
|
2010-08-29 16:17:13 +00:00
|
|
|
;; Package: ediff
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1995-10-06 00:57:20 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1995-10-06 00:57:20 +00:00
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
;;; Code:
|
1995-10-06 00:57:20 +00:00
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
;;; These must be placed in menu-bar.el in Emacs
|
1995-10-06 00:57:20 +00:00
|
|
|
;;
|
1997-05-31 01:10:39 +00:00
|
|
|
;; (define-key menu-bar-tools-menu [ediff-misc]
|
|
|
|
|
;; '("Ediff Miscellanea" . menu-bar-ediff-misc-menu))
|
1995-10-06 00:57:20 +00:00
|
|
|
;; (define-key menu-bar-tools-menu [epatch]
|
|
|
|
|
;; '("Apply Patch" . menu-bar-epatch-menu))
|
|
|
|
|
;; (define-key menu-bar-tools-menu [ediff-merge]
|
|
|
|
|
;; '("Merge" . menu-bar-ediff-merge-menu))
|
|
|
|
|
;; (define-key menu-bar-tools-menu [ediff]
|
|
|
|
|
;; '("Compare" . menu-bar-ediff-menu))
|
|
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;; Compiler pacifier
|
|
|
|
|
(defvar ediff-menu)
|
|
|
|
|
(defvar ediff-merge-menu)
|
|
|
|
|
(defvar epatch-menu)
|
1997-05-31 01:10:39 +00:00
|
|
|
(defvar ediff-misc-menu)
|
1996-06-22 01:54:34 +00:00
|
|
|
;; end pacifier
|
1995-10-06 00:57:20 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
;; allow menus to be set up without ediff-wind.el being loaded
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 14:48:44 +00:00
|
|
|
;; Emacs
|
|
|
|
|
;; initialize menu bar keymaps
|
|
|
|
|
(defvar menu-bar-ediff-misc-menu
|
|
|
|
|
(make-sparse-keymap "Ediff Miscellanea"))
|
|
|
|
|
(fset 'menu-bar-ediff-misc-menu
|
|
|
|
|
menu-bar-ediff-misc-menu)
|
|
|
|
|
(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
|
|
|
|
|
(fset 'menu-bar-epatch-menu menu-bar-epatch-menu)
|
|
|
|
|
(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
|
|
|
|
|
(fset 'menu-bar-ediff-merge-menu
|
|
|
|
|
menu-bar-ediff-merge-menu)
|
|
|
|
|
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
|
|
|
|
|
(fset 'menu-bar-ediff-menu menu-bar-ediff-menu)
|
|
|
|
|
|
|
|
|
|
;; define ediff compare menu
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-misc]
|
|
|
|
|
`(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu))
|
|
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator)
|
|
|
|
|
(define-key menu-bar-ediff-menu [window]
|
|
|
|
|
`(menu-item ,(purecopy "This Window and Next Window") compare-windows
|
|
|
|
|
:help ,(purecopy "Compare the current window and the next window")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-windows-linewise]
|
|
|
|
|
`(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise
|
|
|
|
|
:help ,(purecopy "Compare windows line-wise")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-windows-wordwise]
|
|
|
|
|
`(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise
|
|
|
|
|
:help ,(purecopy "Compare windows word-wise")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator)
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-regions-linewise]
|
|
|
|
|
`(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise
|
|
|
|
|
:help ,(purecopy "Compare regions line-wise")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-regions-wordwise]
|
|
|
|
|
`(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise
|
|
|
|
|
:help ,(purecopy "Compare regions word-wise")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator)
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-dir-revision]
|
|
|
|
|
`(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions
|
|
|
|
|
:help ,(purecopy "Compare directory files with their older versions")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-revision]
|
|
|
|
|
`(menu-item ,(purecopy "File with Revision...") ediff-revision
|
|
|
|
|
:help ,(purecopy "Compare file with its older versions")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator)
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-directories3]
|
|
|
|
|
`(menu-item ,(purecopy "Three Directories...") ediff-directories3
|
|
|
|
|
:help ,(purecopy "Compare files common to three directories simultaneously")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-directories]
|
|
|
|
|
`(menu-item ,(purecopy "Two Directories...") ediff-directories
|
|
|
|
|
:help ,(purecopy "Compare files common to two directories simultaneously")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator)
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-buffers3]
|
|
|
|
|
`(menu-item ,(purecopy "Three Buffers...") ediff-buffers3
|
|
|
|
|
:help ,(purecopy "Compare three buffers simultaneously")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-files3]
|
|
|
|
|
`(menu-item ,(purecopy "Three Files...") ediff-files3
|
|
|
|
|
:help ,(purecopy "Compare three files simultaneously")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-buffers]
|
|
|
|
|
`(menu-item ,(purecopy "Two Buffers...") ediff-buffers
|
|
|
|
|
:help ,(purecopy "Compare two buffers simultaneously")))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-files]
|
|
|
|
|
`(menu-item ,(purecopy "Two Files...") ediff-files
|
|
|
|
|
:help ,(purecopy "Compare two files simultaneously")))
|
|
|
|
|
|
|
|
|
|
;; define ediff merge menu
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
|
|
|
|
|
`(menu-item ,(purecopy "Directory Revisions with Ancestor...")
|
|
|
|
|
ediff-merge-directory-revisions-with-ancestor
|
|
|
|
|
:help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors")))
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
|
|
|
|
|
`(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions
|
|
|
|
|
:help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)")))
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
|
|
|
|
|
`(menu-item ,(purecopy "Revisions with Ancestor...")
|
|
|
|
|
ediff-merge-revisions-with-ancestor
|
|
|
|
|
:help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor")))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
|
|
|
|
|
`(menu-item ,(purecopy "Revisions...") ediff-merge-revisions
|
|
|
|
|
:help ,(purecopy "Merge versions of the same file (without using ancestor information)")))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator)
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
|
|
|
|
|
`(menu-item ,(purecopy "Directories with Ancestor...")
|
|
|
|
|
ediff-merge-directories-with-ancestor
|
|
|
|
|
:help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors")))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
|
|
|
|
|
`(menu-item ,(purecopy "Directories...") ediff-merge-directories
|
|
|
|
|
:help ,(purecopy "Merge files common to a pair of directories")))
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator)
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
|
|
|
|
|
`(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor
|
|
|
|
|
:help ,(purecopy "Merge buffers by comparing their contents with a common ancestor")))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
|
|
|
|
|
`(menu-item ,(purecopy "Buffers...") ediff-merge-buffers
|
|
|
|
|
:help ,(purecopy "Merge buffers (without using ancestor information)")))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
|
|
|
|
|
`(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor
|
|
|
|
|
:help ,(purecopy "Merge files by comparing them with a common ancestor")))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-files]
|
|
|
|
|
`(menu-item ,(purecopy "Files...") ediff-merge-files
|
|
|
|
|
:help ,(purecopy "Merge files (without using ancestor information)")))
|
|
|
|
|
|
|
|
|
|
;; define epatch menu
|
|
|
|
|
(define-key menu-bar-epatch-menu [ediff-patch-buffer]
|
|
|
|
|
`(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer
|
|
|
|
|
:help ,(purecopy "Apply a patch to the contents of a buffer")))
|
|
|
|
|
(define-key menu-bar-epatch-menu [ediff-patch-file]
|
|
|
|
|
`(menu-item ,(purecopy "To a File...") ediff-patch-file
|
|
|
|
|
:help ,(purecopy "Apply a patch to a file")))
|
|
|
|
|
|
|
|
|
|
;; define ediff miscellanea
|
|
|
|
|
(define-key menu-bar-ediff-misc-menu [emultiframe]
|
|
|
|
|
`(menu-item ,(purecopy "Use separate control buffer frame")
|
|
|
|
|
ediff-toggle-multiframe
|
|
|
|
|
:help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode")
|
|
|
|
|
:button (:toggle . (eq (bound-and-true-p ediff-window-setup-function)
|
|
|
|
|
#'ediff-setup-windows-multiframe))))
|
|
|
|
|
;; FIXME: Port XEmacs's toolbar support!
|
|
|
|
|
;; ["Use a toolbar with Ediff control buffer"
|
|
|
|
|
;; ediff-toggle-use-toolbar
|
|
|
|
|
;; :style toggle
|
|
|
|
|
;; :selected (if (featurep 'ediff-tbar)
|
|
|
|
|
;; (ediff-use-toolbar-p))]
|
|
|
|
|
(define-key menu-bar-ediff-misc-menu [eregistry]
|
|
|
|
|
`(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry
|
|
|
|
|
:help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session")))
|
|
|
|
|
(define-key menu-bar-ediff-misc-menu [ediff-cust]
|
|
|
|
|
`(menu-item ,(purecopy "Customize Ediff") ediff-customize
|
|
|
|
|
:help ,(purecopy "Change some of the parameters that govern the behavior of Ediff")))
|
|
|
|
|
(define-key menu-bar-ediff-misc-menu [ediff-doc]
|
|
|
|
|
`(menu-item ,(purecopy "Ediff Manual") ediff-documentation
|
|
|
|
|
:help ,(purecopy "Bring up the Ediff manual")))
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
(provide 'ediff-hook)
|
|
|
|
|
;;; ediff-hook.el ends here
|