1995-10-06 00:57:20 +00:00
|
|
|
;;; ediff-hook.el --- setup for Ediff's menus and autoloads
|
1996-01-14 07:34:30 +00:00
|
|
|
|
2005-08-06 22:13:43 +00:00
|
|
|
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
|
2007-01-21 03:53:13 +00:00
|
|
|
;; 2004, 2005, 2006, 2007 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>
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2007-07-25 04:50:21 +00:00
|
|
|
;; the Free Software Foundation; either version 3, or (at your option)
|
1995-10-06 00:57:20 +00:00
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
|
|
;; 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
|
1996-01-14 07:34:30 +00:00
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 23:32:44 +00:00
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
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-09-18 04:23:27 +00:00
|
|
|
;;;###autoload
|
1997-05-31 01:10:39 +00:00
|
|
|
(defvar ediff-window-setup-function)
|
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
|
|
|
|
2002-04-26 05:17:53 +00:00
|
|
|
;; This macro is used to avoid compilation warnings.
|
|
|
|
|
;; The macro will expand into the form that is appropriate to the
|
|
|
|
|
;; compiler at hand (emacs or xemacs).
|
|
|
|
|
;; The autoload, below, is useless in Emacs because ediff-hook.el
|
|
|
|
|
;; is dumped with emacs, but it is needed in XEmacs
|
2002-09-19 01:02:06 +00:00
|
|
|
;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form))
|
|
|
|
|
|
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
|
|
|
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
|
|
|
|
|
(if (string-match "XEmacs" emacs-version)
|
|
|
|
|
xemacs-form emacs-form))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2002-04-26 05:17:53 +00:00
|
|
|
;; This autoload is useless in Emacs because ediff-hook.el is dumped with
|
|
|
|
|
;; emacs, but it is needed in XEmacs
|
2002-09-18 04:23:27 +00:00
|
|
|
;;;###autoload
|
2002-04-26 05:17:53 +00:00
|
|
|
(ediff-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
;; xemacs form
|
|
|
|
|
(defun ediff-xemacs-init-menus ()
|
|
|
|
|
(if (featurep 'menubar)
|
|
|
|
|
(progn
|
|
|
|
|
(add-submenu
|
|
|
|
|
'("Tools") ediff-menu "OO-Browser...")
|
|
|
|
|
(add-submenu
|
|
|
|
|
'("Tools") ediff-merge-menu "OO-Browser...")
|
|
|
|
|
(add-submenu
|
|
|
|
|
'("Tools") epatch-menu "OO-Browser...")
|
|
|
|
|
(add-submenu
|
|
|
|
|
'("Tools") ediff-misc-menu "OO-Browser...")
|
|
|
|
|
(add-menu-button
|
|
|
|
|
'("Tools") "-------" "OO-Browser...")
|
|
|
|
|
)))
|
|
|
|
|
nil ; emacs form
|
|
|
|
|
)
|
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
|
|
|
|
|
|
|
|
|
2002-04-26 05:17:53 +00:00
|
|
|
;; This autoload is useless in Emacs because ediff-hook.el is dumped with
|
|
|
|
|
;; emacs, but it is needed in XEmacs
|
2002-09-18 04:23:27 +00:00
|
|
|
;;;###autoload
|
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
|
|
|
(ediff-cond-compile-for-xemacs-or-emacs
|
|
|
|
|
(progn
|
|
|
|
|
(defvar ediff-menu
|
|
|
|
|
'("Compare"
|
|
|
|
|
["Two Files..." ediff-files t]
|
|
|
|
|
["Two Buffers..." ediff-buffers t]
|
|
|
|
|
["Three Files..." ediff-files3 t]
|
|
|
|
|
["Three Buffers..." ediff-buffers3 t]
|
|
|
|
|
"---"
|
|
|
|
|
["Two Directories..." ediff-directories t]
|
|
|
|
|
["Three Directories..." ediff-directories3 t]
|
|
|
|
|
"---"
|
|
|
|
|
["File with Revision..." ediff-revision t]
|
|
|
|
|
["Directory Revisions..." ediff-directory-revisions t]
|
|
|
|
|
"---"
|
|
|
|
|
["Windows Word-by-word..." ediff-windows-wordwise t]
|
|
|
|
|
["Windows Line-by-line..." ediff-windows-linewise t]
|
|
|
|
|
"---"
|
|
|
|
|
["Regions Word-by-word..." ediff-regions-wordwise t]
|
|
|
|
|
["Regions Line-by-line..." ediff-regions-linewise t]
|
|
|
|
|
))
|
|
|
|
|
(defvar ediff-merge-menu
|
|
|
|
|
'("Merge"
|
|
|
|
|
["Files..." ediff-merge-files t]
|
|
|
|
|
["Files with Ancestor..." ediff-merge-files-with-ancestor t]
|
|
|
|
|
["Buffers..." ediff-merge-buffers t]
|
|
|
|
|
["Buffers with Ancestor..."
|
|
|
|
|
ediff-merge-buffers-with-ancestor t]
|
|
|
|
|
"---"
|
|
|
|
|
["Directories..." ediff-merge-directories t]
|
|
|
|
|
["Directories with Ancestor..."
|
|
|
|
|
ediff-merge-directories-with-ancestor t]
|
|
|
|
|
"---"
|
|
|
|
|
["Revisions..." ediff-merge-revisions t]
|
|
|
|
|
["Revisions with Ancestor..."
|
|
|
|
|
ediff-merge-revisions-with-ancestor t]
|
|
|
|
|
["Directory Revisions..." ediff-merge-directory-revisions t]
|
|
|
|
|
["Directory Revisions with Ancestor..."
|
|
|
|
|
ediff-merge-directory-revisions-with-ancestor t]
|
|
|
|
|
))
|
|
|
|
|
(defvar epatch-menu
|
|
|
|
|
'("Apply Patch"
|
|
|
|
|
["To a file..." ediff-patch-file t]
|
|
|
|
|
["To a buffer..." ediff-patch-buffer t]
|
|
|
|
|
))
|
|
|
|
|
(defvar ediff-misc-menu
|
|
|
|
|
'("Ediff Miscellanea"
|
2005-03-28 01:18:22 +00:00
|
|
|
["Ediff Manual" ediff-documentation t]
|
|
|
|
|
["Customize Ediff" ediff-customize t]
|
|
|
|
|
["List Ediff Sessions" ediff-show-registry t]
|
|
|
|
|
["Use separate frame for Ediff control buffer"
|
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
|
|
|
ediff-toggle-multiframe
|
|
|
|
|
:style toggle
|
|
|
|
|
:selected (if (and (featurep 'ediff-util)
|
|
|
|
|
(boundp 'ediff-window-setup-function))
|
|
|
|
|
(eq ediff-window-setup-function
|
|
|
|
|
'ediff-setup-windows-multiframe))]
|
|
|
|
|
["Use a toolbar with Ediff control buffer"
|
|
|
|
|
ediff-toggle-use-toolbar
|
|
|
|
|
:style toggle
|
|
|
|
|
:selected (if (featurep 'ediff-tbar)
|
|
|
|
|
(ediff-use-toolbar-p))]
|
|
|
|
|
))
|
2003-02-04 11:26:42 +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
|
|
|
;; put these menus before Object-Oriented-Browser in Tools menu
|
|
|
|
|
(if (and (featurep 'menubar) (not (featurep 'infodock))
|
|
|
|
|
(not (featurep 'ediff-hook)))
|
1999-11-01 07:16:15 +00:00
|
|
|
(ediff-xemacs-init-menus)))
|
2003-02-04 11:26:42 +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
|
|
|
;; Emacs--only if menu-bar is loaded
|
|
|
|
|
(if (featurep 'menu-bar)
|
|
|
|
|
(progn
|
1995-10-06 00:57:20 +00:00
|
|
|
;; initialize menu bar keymaps
|
1997-05-31 01:10:39 +00:00
|
|
|
(defvar menu-bar-ediff-misc-menu
|
|
|
|
|
(make-sparse-keymap "Ediff Miscellanea"))
|
|
|
|
|
(fset 'menu-bar-ediff-misc-menu
|
|
|
|
|
(symbol-value 'menu-bar-ediff-misc-menu))
|
1995-11-20 23:11:39 +00:00
|
|
|
(defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
|
1995-10-06 00:57:20 +00:00
|
|
|
(fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
|
1995-11-20 23:11:39 +00:00
|
|
|
(defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
|
2003-02-04 11:26:42 +00:00
|
|
|
(fset 'menu-bar-ediff-merge-menu
|
1995-10-06 00:57:20 +00:00
|
|
|
(symbol-value 'menu-bar-ediff-merge-menu))
|
1995-11-20 23:11:39 +00:00
|
|
|
(defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
|
1995-10-06 00:57:20 +00:00
|
|
|
(fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
|
|
|
|
|
|
|
|
|
|
;; define ediff-menu
|
1995-10-14 03:12:53 +00:00
|
|
|
(define-key menu-bar-ediff-menu [window]
|
1996-02-16 06:36:35 +00:00
|
|
|
'("This Window and Next Window" . compare-windows))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-windows-linewise]
|
|
|
|
|
'("Windows Line-by-line..." . ediff-windows-linewise))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-windows-wordwise]
|
|
|
|
|
'("Windows Word-by-word..." . ediff-windows-wordwise))
|
|
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-regions-linewise]
|
|
|
|
|
'("Regions Line-by-line..." . ediff-regions-linewise))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-regions-wordwise]
|
|
|
|
|
'("Regions Word-by-word..." . ediff-regions-wordwise))
|
|
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [ediff-dir-revision]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Directory Revisions..." . ediff-directory-revisions))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [ediff-revision]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("File with Revision..." . ediff-revision))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-directories3]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Three Directories..." . ediff-directories3))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [ediff-directories]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Two Directories..." . ediff-directories))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
|
|
|
|
|
(define-key menu-bar-ediff-menu [ediff-buffers3]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Three Buffers..." . ediff-buffers3))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [ediff-files3]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Three Files..." . ediff-files3))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [ediff-buffers]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Two Buffers..." . ediff-buffers))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-menu [ediff-files]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Two Files..." . ediff-files))
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; define merge menu
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Directory Revisions with Ancestor..."
|
1995-10-06 00:57:20 +00:00
|
|
|
. ediff-merge-directory-revisions-with-ancestor))
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Directory Revisions..." . ediff-merge-directory-revisions))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Revisions with Ancestor..."
|
1995-10-06 00:57:20 +00:00
|
|
|
. ediff-merge-revisions-with-ancestor))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Revisions..." . ediff-merge-revisions))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Directories with Ancestor..."
|
1995-10-06 00:57:20 +00:00
|
|
|
. ediff-merge-directories-with-ancestor))
|
|
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Directories..." . ediff-merge-directories))
|
2003-02-04 11:26:42 +00:00
|
|
|
(define-key
|
1995-10-06 00:57:20 +00:00
|
|
|
menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
|
|
|
|
|
(define-key
|
|
|
|
|
menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Buffers..." . ediff-merge-buffers))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Files with Ancestor..." . ediff-merge-files-with-ancestor))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-ediff-merge-menu [ediff-merge-files]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("Files..." . ediff-merge-files))
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; define epatch menu
|
|
|
|
|
(define-key menu-bar-epatch-menu [ediff-patch-buffer]
|
1996-01-09 23:16:28 +00:00
|
|
|
'("To a Buffer..." . ediff-patch-buffer))
|
1995-10-06 00:57:20 +00:00
|
|
|
(define-key menu-bar-epatch-menu [ediff-patch-file]
|
1997-05-31 01:10:39 +00:00
|
|
|
'("To a File..." . ediff-patch-file))
|
|
|
|
|
|
|
|
|
|
;; define ediff miscellanea
|
|
|
|
|
(define-key menu-bar-ediff-misc-menu [emultiframe]
|
2005-03-28 01:18:22 +00:00
|
|
|
'("Toggle use of separate control buffer frame"
|
1997-05-31 01:10:39 +00:00
|
|
|
. ediff-toggle-multiframe))
|
|
|
|
|
(define-key menu-bar-ediff-misc-menu [eregistry]
|
2005-03-28 01:18:22 +00:00
|
|
|
'("List Ediff Sessions" . ediff-show-registry))
|
1999-11-01 07:16:15 +00:00
|
|
|
(define-key menu-bar-ediff-misc-menu [ediff-cust]
|
2005-03-28 01:18:22 +00:00
|
|
|
'("Customize Ediff" . ediff-customize))
|
1997-05-31 01:10:39 +00:00
|
|
|
(define-key menu-bar-ediff-misc-menu [ediff-doc]
|
2005-03-28 01:18:22 +00:00
|
|
|
'("Ediff Manual" . ediff-documentation))
|
1997-05-31 01:10:39 +00:00
|
|
|
)
|
2003-02-04 11:26:42 +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
|
|
|
) ; emacs case
|
|
|
|
|
) ; ediff-cond-compile-for-xemacs-or-emacs
|
1995-10-06 00:57:20 +00:00
|
|
|
|
1995-10-14 03:12:53 +00:00
|
|
|
;; arrange for autoloads
|
1995-10-06 00:57:20 +00:00
|
|
|
(if purify-flag
|
|
|
|
|
() ; if dumping, autoloads are set up in loaddefs.el
|
|
|
|
|
;; if the user decides to load this file, set up autoloads
|
|
|
|
|
;; compare files and buffers
|
|
|
|
|
(autoload 'ediff "ediff" "Compare two files" t)
|
|
|
|
|
(autoload 'ediff-files "ediff" "Compare two files" t)
|
|
|
|
|
(autoload 'ediff-buffers "ediff" "Compare two bufers" t)
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'ebuffers "ediff" "Compare two bufers" t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff3 "ediff" "Compare three files" t)
|
|
|
|
|
(autoload 'ediff-files3 "ediff" "Compare three files" t)
|
|
|
|
|
(autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'ebuffers3 "ediff" "Compare three bufers" t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
(autoload 'erevision "ediff" "Compare versions of a file" t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-revision "ediff" "Compare versions of a file" t)
|
|
|
|
|
|
|
|
|
|
;; compare regions and windows
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'ediff-windows-wordwise
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Compare two windows word-by-word." t)
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'ediff-regions-wordwise
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Compare two regions word-by-word." t)
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'ediff-windows-linewise
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Compare two windows line-by-line." t)
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'ediff-regions-linewise
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Compare two regions line-by-line." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; patch
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'ediff-patch-file "ediff" "Patch a file." t)
|
|
|
|
|
(autoload 'epatch "ediff" "Patch a file." t)
|
|
|
|
|
(autoload 'ediff-patch-buffer "ediff" "Patch a buffer.")
|
|
|
|
|
(autoload 'epatch-buffer "ediff" "Patch a buffer." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; merge
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'ediff-merge "ediff" "Merge two files." t)
|
|
|
|
|
(autoload 'ediff-merge-files "ediff" "Merge two files." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-merge-files-with-ancestor
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Merge two files using a third file as an ancestor." t)
|
|
|
|
|
(autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-merge-buffers-with-ancestor
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Merge two buffers using a third buffer as an ancestor." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-merge-revisions-with-ancestor
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Merge two versions of a file." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; compare directories
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'edirs "ediff" "Compare files in two directories." t)
|
|
|
|
|
(autoload 'ediff-directories "ediff" "Compare files in two directories." t)
|
|
|
|
|
(autoload 'edirs3 "ediff" "Compare files in three directories." t)
|
|
|
|
|
(autoload
|
|
|
|
|
'ediff-directories3 "ediff" "Compare files in three directories." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'edir-revisions
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Compare two versions of a file." t)
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'ediff-directory-revisions
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Compare two versions of a file." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
|
|
|
|
;; merge directories
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'edirs-merge "ediff" "Merge files in two directories." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-merge-directories
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Merge files in two directories." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'edirs-merge-with-ancestor
|
|
|
|
|
"ediff"
|
1996-06-22 01:54:34 +00:00
|
|
|
"Merge files in two directories using files in a third dir as ancestors."
|
|
|
|
|
t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-merge-directories-with-ancestor
|
|
|
|
|
"ediff"
|
1996-06-22 01:54:34 +00:00
|
|
|
"Merge files in two directories using files in a third dir as ancestors."
|
|
|
|
|
t)
|
1995-10-06 00:57:20 +00:00
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'edir-merge-revisions
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Merge versions of files in a directory." t)
|
2003-02-04 11:26:42 +00:00
|
|
|
(autoload 'ediff-merge-directory-revisions
|
1996-06-22 01:54:34 +00:00
|
|
|
"ediff" "Merge versions of files in a directory." t)
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-merge-directory-revisions-with-ancestor
|
|
|
|
|
"ediff"
|
1996-06-22 01:54:34 +00:00
|
|
|
"Merge versions of files in a directory using other versions as ancestors."
|
1995-10-06 00:57:20 +00:00
|
|
|
t)
|
|
|
|
|
(autoload 'edir-merge-revisions-with-ancestor
|
|
|
|
|
"ediff"
|
1996-06-22 01:54:34 +00:00
|
|
|
"Merge versions of files in a directory using other versions as ancestors."
|
1995-10-06 00:57:20 +00:00
|
|
|
t)
|
1995-10-14 03:12:53 +00:00
|
|
|
|
|
|
|
|
;; misc
|
1995-10-06 00:57:20 +00:00
|
|
|
(autoload 'ediff-show-registry
|
1996-09-20 01:10:05 +00:00
|
|
|
"ediff-mult"
|
1996-06-22 01:54:34 +00:00
|
|
|
"Display the registry of active Ediff sessions."
|
|
|
|
|
t)
|
1997-07-17 19:37:07 +00:00
|
|
|
(autoload 'eregistry
|
|
|
|
|
"ediff-mult"
|
|
|
|
|
"Display the registry of active Ediff sessions."
|
|
|
|
|
t)
|
1996-06-22 01:54:34 +00:00
|
|
|
(autoload 'ediff-documentation
|
|
|
|
|
"ediff"
|
|
|
|
|
"Display Ediff's manual."
|
1995-10-06 00:57:20 +00:00
|
|
|
t)
|
1995-10-14 03:12:53 +00:00
|
|
|
(autoload 'ediff-version
|
|
|
|
|
"ediff"
|
1996-06-22 01:54:34 +00:00
|
|
|
"Show Ediff's version and last modification date."
|
1995-10-14 03:12:53 +00:00
|
|
|
t)
|
1996-12-28 02:53:04 +00:00
|
|
|
(autoload 'ediff-toggle-multiframe
|
|
|
|
|
"ediff-util"
|
|
|
|
|
"Toggle the use of separate frame for Ediff control buffer."
|
|
|
|
|
t)
|
1997-05-31 01:10:39 +00:00
|
|
|
(autoload 'ediff-toggle-use-toolbar
|
|
|
|
|
"ediff-util"
|
|
|
|
|
"Toggle the use of Ediff toolbar."
|
|
|
|
|
t)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-10-06 00:57:20 +00:00
|
|
|
) ; if purify-flag
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(provide 'ediff-hook)
|
|
|
|
|
|
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-insert-state-post-command-sentinel,
viper-change-state-to-vi, viper-change-state-to-emacs):
made aware of cursor coloring in the emacs state.
(viper-special-read-and-insert-char): use read-char-exclusive.
(viper-minibuffer-trim-tail): workaround for fields in minibuffer.
* viper-init.el (viper-emacs-state-cursor-color): new variable.
* viper-util.el (viper-save-cursor-color,
viper-get-saved-cursor-color-in-replace-mode,
viper-get-saved-cursor-color-in-insert-mode,
viper-restore-cursor-color): make aware of the cursor color in emacs
state.
(viper-get-saved-cursor-color-in-emacs-mode): new function.
* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option,
ediff-ignore-case-option3, ediff-actual-diff-options,
ediff-actual-diff3-options): new variables to control case sensitivity.
(ediff-make-diff2-buffer, ediff-setup-fine-diff-regions,
ediff-setup-diff-regions3): made aware of case-sensitivity.
(ediff-toggle-ignore-case): new function.
(ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers.
* ediff-help.el (ediff-long-help-message-narrow2,
ediff-long-help-message-compare2, ediff-long-help-message-compare3,
ediff-long-help-message-word-mode): add ignore-case command.
(ediff-help-for-quick-help): add ignore-case command.
* ediff-merg.el: move provide to the end.
* ediff-ptch.el: move provide to the end.
* ediff-wind.el: move provide to the end.
* ediff-mult.el: move provide to the end.
(ediff-set-meta-overlay): enable follow-link.
* ediff.el: move provide to the end.
Break recursive load cycle in eval-when-compile.
(ediff-patch-buffer): better heuristics.
* ediff-util.el: move provide to the end.
Break recursive load cycle in eval-when-compile.
(ediff-setup-keymap): add binding for #c. Replaced some defsubsts with
defuns.
(ediff-submit-report): pass the values of ediff-diff3-program,
ediff-diff3-options.
2006-02-19 03:16:45 +00:00
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
|
1995-10-06 00:57:20 +00:00
|
|
|
;;; ediff-hook.el ends here
|