1995-03-16 22:34:51 +00:00
|
|
|
;;; ediff-diff.el --- diff-related utilities
|
1996-01-14 07:34:30 +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
|
|
|
;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
|
1995-03-16 22:34:51 +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-03-16 22:34:51 +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
|
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
;; 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
|
|
|
|
|
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
;; Boston, MA 02111-1307, USA.
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
;;; Code:
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(provide 'ediff-diff)
|
|
|
|
|
|
|
|
|
|
;; compiler pacifier
|
|
|
|
|
(defvar ediff-default-variant)
|
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
|
|
|
(defvar null-device)
|
1997-05-31 01:10:39 +00:00
|
|
|
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
(let ((load-path (cons (expand-file-name ".") load-path)))
|
|
|
|
|
(or (featurep 'ediff-init)
|
|
|
|
|
(load "ediff-init.el" nil nil 'nosuffix))
|
|
|
|
|
(or (featurep 'ediff-util)
|
|
|
|
|
(load "ediff-util.el" nil nil 'nosuffix))
|
|
|
|
|
))
|
|
|
|
|
;; end pacifier
|
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
(require 'ediff-init)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defgroup ediff-diff nil
|
|
|
|
|
"Diff related utilities"
|
|
|
|
|
:prefix "ediff-"
|
|
|
|
|
:group 'ediff)
|
|
|
|
|
|
2000-11-24 08:15:11 +00:00
|
|
|
;; these two must be here to prevent ediff-test-utility from barking
|
|
|
|
|
(defcustom ediff-diff-program "diff"
|
|
|
|
|
"*Program to use for generating the differential of the two files."
|
|
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
|
|
|
|
(defcustom ediff-diff3-program "diff3"
|
|
|
|
|
"*Program to be used for three-way comparison.
|
|
|
|
|
Must produce output compatible with Unix's diff3 program."
|
|
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
|
|
|
|
|
2001-02-12 08:47:13 +00:00
|
|
|
|
2000-11-24 08:15:11 +00:00
|
|
|
;; The following functions must precede all defcustom-defined variables.
|
1996-02-16 06:36:35 +00:00
|
|
|
|
2000-05-24 17:31:16 +00:00
|
|
|
;; The following functions needed for setting diff/diff3 options
|
|
|
|
|
;; test if diff supports the --binary option
|
|
|
|
|
(defsubst ediff-test-utility (diff-util option &optional files)
|
2004-01-03 12:12:01 +00:00
|
|
|
(eq 0 (apply 'call-process
|
|
|
|
|
(append (list diff-util nil nil nil option) files))))
|
2000-05-24 17:31:16 +00:00
|
|
|
|
|
|
|
|
(defun ediff-diff-mandatory-option (diff-util)
|
|
|
|
|
(let ((file (if (boundp 'null-device) null-device "/dev/null")))
|
|
|
|
|
(cond ((not (memq system-type '(ms-dos windows-nt windows-95)))
|
|
|
|
|
"")
|
|
|
|
|
((and (string= diff-util ediff-diff-program)
|
|
|
|
|
(ediff-test-utility
|
|
|
|
|
ediff-diff-program "--binary" (list file file)))
|
|
|
|
|
"--binary")
|
|
|
|
|
((and (string= diff-util ediff-diff3-program)
|
|
|
|
|
(ediff-test-utility
|
|
|
|
|
ediff-diff3-program "--binary" (list file file file)))
|
|
|
|
|
"--binary")
|
|
|
|
|
(t ""))))
|
|
|
|
|
|
|
|
|
|
;; make sure that mandatory options are added even if the user changes
|
|
|
|
|
;; ediff-diff-options or ediff-diff3-options in the customization widget
|
|
|
|
|
(defun ediff-reset-diff-options (symb val)
|
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
|
|
|
(let* ((diff-program
|
|
|
|
|
(if (eq symb 'ediff-diff-options)
|
2000-05-24 17:31:16 +00:00
|
|
|
ediff-diff-program
|
|
|
|
|
ediff-diff3-program))
|
|
|
|
|
(mandatory-option (ediff-diff-mandatory-option diff-program))
|
|
|
|
|
(spacer (if (string-equal mandatory-option "") "" " ")))
|
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
|
|
|
(set symb
|
2000-05-24 17:31:16 +00:00
|
|
|
(if (string-match mandatory-option val)
|
|
|
|
|
val
|
|
|
|
|
(concat mandatory-option spacer val)))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defcustom ediff-shell
|
1995-03-16 22:34:51 +00:00
|
|
|
(cond ((eq system-type 'emx) "cmd") ; OS/2
|
1996-06-22 01:54:34 +00:00
|
|
|
((memq system-type '(ms-dos windows-nt windows-95))
|
|
|
|
|
shell-file-name) ; no standard name on MS-DOS
|
1995-03-16 22:34:51 +00:00
|
|
|
((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS
|
|
|
|
|
(t "sh")) ; UNIX
|
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
|
|
|
"*The shell used to run diff and patch.
|
|
|
|
|
If user's .profile or .cshrc files are set up correctly, any shell
|
|
|
|
|
will do. However, some people set $prompt or other things
|
|
|
|
|
incorrectly, which leads to undesirable output messages. These may
|
|
|
|
|
cause Ediff to fail. In such a case, set `ediff-shell' to a shell that
|
|
|
|
|
you are not using or, better, fix your shell's startup file."
|
1997-05-31 01:10:39 +00:00
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-11-01 01:46:51 +00:00
|
|
|
(defcustom ediff-cmp-program "cmp"
|
|
|
|
|
"*Utility to use to determine if two files are identical.
|
|
|
|
|
It must return code 0, if its arguments are identical files."
|
|
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
(defcustom ediff-cmp-options nil
|
2001-12-11 06:04:14 +00:00
|
|
|
"*Options to pass to `ediff-cmp-program'.
|
|
|
|
|
If GNU diff is used as `ediff-cmp-program', then the most useful options
|
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
|
|
|
are `-I REGEXP', to ignore changes whose lines match the REGEXP."
|
1999-11-01 07:16:15 +00:00
|
|
|
:type '(repeat string)
|
|
|
|
|
:group 'ediff-diff)
|
|
|
|
|
|
2000-05-24 17:31:16 +00:00
|
|
|
(defcustom ediff-diff-options ""
|
2003-02-04 11:26:42 +00:00
|
|
|
"*Options to pass to `ediff-diff-program'.
|
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
|
|
|
If Unix diff is used as `ediff-diff-program', then the most useful options are
|
1995-03-16 22:34:51 +00:00
|
|
|
`-w', to ignore space, and `-i', to ignore case of letters.
|
1997-09-06 04:16:05 +00:00
|
|
|
At present, the option `-c' is not allowed."
|
2000-05-24 17:31:16 +00:00
|
|
|
:set 'ediff-reset-diff-options
|
1997-05-31 01:10:39 +00:00
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defcustom ediff-custom-diff-program ediff-diff-program
|
1995-03-16 22:34:51 +00:00
|
|
|
"*Program to use for generating custom diff output for saving it in a file.
|
1997-05-31 01:10:39 +00:00
|
|
|
This output is not used by Ediff internally."
|
|
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
|
|
|
|
(defcustom ediff-custom-diff-options "-c"
|
|
|
|
|
"*Options to pass to `ediff-custom-diff-program'."
|
|
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;;; Support for diff3
|
|
|
|
|
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
(defvar ediff-match-diff3-line "^====\\(.?\\)\C-m?$"
|
1995-03-16 22:34:51 +00:00
|
|
|
"Pattern to match lines produced by diff3 that describe differences.")
|
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
|
|
|
(defcustom ediff-diff3-options ""
|
1997-05-31 01:10:39 +00:00
|
|
|
"*Options to pass to `ediff-diff3-program'."
|
2000-05-24 17:31:16 +00:00
|
|
|
:set 'ediff-reset-diff-options
|
1997-05-31 01:10:39 +00:00
|
|
|
:type 'string
|
|
|
|
|
:group 'ediff-diff)
|
|
|
|
|
(defcustom ediff-diff3-ok-lines-regexp
|
1996-06-22 01:54:34 +00:00
|
|
|
"^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)"
|
1995-03-16 22:34:51 +00:00
|
|
|
"*Regexp that matches normal output lines from `ediff-diff3-program'.
|
1997-05-31 01:10:39 +00:00
|
|
|
Lines that do not match are assumed to be error messages."
|
|
|
|
|
:type 'regexp
|
|
|
|
|
:group 'ediff-diff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; keeps the status of the current diff in 3-way jobs.
|
|
|
|
|
;; the status can be =diff(A), =diff(B), or =diff(A+B)
|
|
|
|
|
(ediff-defvar-local ediff-diff-status "" "")
|
|
|
|
|
|
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
|
|
|
;;; Fine differences
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
(ediff-defvar-local ediff-auto-refine (if (ediff-has-face-support-p) 'on 'nix)
|
1995-03-16 22:34:51 +00:00
|
|
|
"If `on', Ediff auto-highlights fine diffs for the current diff region.
|
|
|
|
|
If `off', auto-highlighting is not used. If `nix', no fine diffs are shown
|
|
|
|
|
at all, unless the user force-refines the region by hitting `*'.
|
|
|
|
|
|
|
|
|
|
This variable can be set either in .emacs or toggled interactively.
|
|
|
|
|
Use `setq-default' if setting it in .emacs")
|
|
|
|
|
|
|
|
|
|
(ediff-defvar-local ediff-ignore-similar-regions nil
|
|
|
|
|
"*If t, skip over difference regions that differ only in the white space and line breaks.
|
|
|
|
|
This variable can be set either in .emacs or toggled interactively.
|
|
|
|
|
Use `setq-default' if setting it in .emacs")
|
|
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(ediff-defvar-local ediff-auto-refine-limit 1400
|
|
|
|
|
"*Auto-refine only the regions of this size \(in bytes\) or less.")
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;;; General
|
|
|
|
|
|
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
|
|
|
(defvar ediff-diff-ok-lines-regexp
|
1997-11-25 02:10:08 +00:00
|
|
|
(concat
|
|
|
|
|
"^\\("
|
|
|
|
|
"[0-9,]+[acd][0-9,]+\C-m?$"
|
|
|
|
|
"\\|[<>] "
|
|
|
|
|
"\\|---"
|
|
|
|
|
"\\|.*Warning *:"
|
|
|
|
|
"\\|.*No +newline"
|
|
|
|
|
"\\|.*missing +newline"
|
|
|
|
|
"\\|^\C-m?$"
|
|
|
|
|
"\\)")
|
1995-03-16 22:34:51 +00:00
|
|
|
"Regexp that matches normal output lines from `ediff-diff-program'.
|
|
|
|
|
This is mostly lifted from Emerge, except that Ediff also considers
|
|
|
|
|
warnings and `Missing newline'-type messages to be normal output.
|
|
|
|
|
Lines that do not match are assumed to be error messages.")
|
|
|
|
|
|
1997-11-25 02:10:08 +00:00
|
|
|
(defvar ediff-match-diff-line
|
|
|
|
|
(let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)"))
|
|
|
|
|
(concat "^" x "\\([acd]\\)" x "\C-m?$"))
|
1995-03-16 22:34:51 +00:00
|
|
|
"Pattern to match lines produced by diff that describe differences.")
|
|
|
|
|
|
|
|
|
|
(ediff-defvar-local ediff-setup-diff-regions-function nil
|
|
|
|
|
"value is a function symbol depending on the kind of job is to be done.
|
|
|
|
|
For 2-way jobs and for ediff-merge, it should be `ediff-setup-diff-regions'.
|
|
|
|
|
For jobs requiring diff3, it should be `ediff-setup-diff-regions3'.
|
|
|
|
|
|
|
|
|
|
The function should take three mandatory arguments, file-A, file-B, and
|
|
|
|
|
file-C. It may ignore file C for diff2 jobs. It should also take
|
|
|
|
|
one optional arguments, diff-number to refine.")
|
|
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;;; Functions
|
|
|
|
|
|
|
|
|
|
;; Generate the difference vector and overlays for the two files
|
|
|
|
|
;; With optional arg REG-TO-REFINE, refine this region.
|
|
|
|
|
;; File-C argument is not used here. It is there just because
|
|
|
|
|
;; ediff-setup-diff-regions is called via a funcall to
|
|
|
|
|
;; ediff-setup-diff-regions-function, which can also have the value
|
|
|
|
|
;; ediff-setup-diff-regions3, which takes 4 arguments.
|
|
|
|
|
(defun ediff-setup-diff-regions (file-A file-B file-C)
|
2002-11-17 22:26:48 +00:00
|
|
|
;; looking either for '-c' or a 'c' in a set of clustered non-long options
|
|
|
|
|
(if (string-match "^-c\\| -c\\|-[^- ]+c" ediff-diff-options)
|
1997-09-06 04:16:05 +00:00
|
|
|
(error "Option `-c' is not allowed in `ediff-diff-options'"))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;; create, if it doesn't exist
|
1995-03-16 22:34:51 +00:00
|
|
|
(or (ediff-buffer-live-p ediff-diff-buffer)
|
|
|
|
|
(setq ediff-diff-buffer
|
|
|
|
|
(get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
|
1996-06-22 01:54:34 +00:00
|
|
|
(ediff-make-diff2-buffer ediff-diff-buffer file-A file-B)
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-prepare-error-list ediff-diff-ok-lines-regexp ediff-diff-buffer)
|
|
|
|
|
(ediff-convert-diffs-to-overlays
|
|
|
|
|
(ediff-extract-diffs
|
1996-02-16 06:36:35 +00:00
|
|
|
ediff-diff-buffer ediff-word-mode ediff-narrow-bounds)))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
1996-06-22 03:20:38 +00:00
|
|
|
;; Run the diff program on FILE1 and FILE2 and put the output in DIFF-BUFFER
|
|
|
|
|
;; Return the size of DIFF-BUFFER
|
2001-02-12 08:47:13 +00:00
|
|
|
;; The return code isn't used in the program at present.
|
1996-06-22 01:54:34 +00:00
|
|
|
(defun ediff-make-diff2-buffer (diff-buffer file1 file2)
|
1996-09-20 01:10:05 +00:00
|
|
|
(let ((file1-size (ediff-file-size file1))
|
|
|
|
|
(file2-size (ediff-file-size file2)))
|
|
|
|
|
(cond ((not (numberp file1-size))
|
|
|
|
|
(message "Can't find file: %s"
|
|
|
|
|
(ediff-abbreviate-file-name file1))
|
|
|
|
|
(sit-for 2)
|
|
|
|
|
;; 1 is an error exit code
|
|
|
|
|
1)
|
|
|
|
|
((not (numberp file2-size))
|
|
|
|
|
(message "Can't find file: %s"
|
|
|
|
|
(ediff-abbreviate-file-name file2))
|
|
|
|
|
(sit-for 2)
|
|
|
|
|
;; 1 is an error exit code
|
|
|
|
|
1)
|
|
|
|
|
(t (message "Computing differences between %s and %s ..."
|
|
|
|
|
(file-name-nondirectory file1)
|
|
|
|
|
(file-name-nondirectory file2))
|
|
|
|
|
;; this erases the diff buffer automatically
|
|
|
|
|
(ediff-exec-process ediff-diff-program
|
|
|
|
|
diff-buffer
|
|
|
|
|
'synchronize
|
|
|
|
|
ediff-diff-options file1 file2)
|
|
|
|
|
(message "")
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer diff-buffer
|
1996-09-20 01:10:05 +00:00
|
|
|
(buffer-size))))))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; If file-A/B/C is nil, do 2-way comparison with the non-nil buffers
|
|
|
|
|
;; This function works for diff3 and diff2 jobs
|
|
|
|
|
(defun ediff-setup-fine-diff-regions (file-A file-B file-C reg-num)
|
|
|
|
|
(or (ediff-buffer-live-p ediff-fine-diff-buffer)
|
|
|
|
|
(setq ediff-fine-diff-buffer
|
|
|
|
|
(get-buffer-create
|
|
|
|
|
(ediff-unique-buffer-name "*ediff-fine-diff" "*"))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-05-06 23:17:23 +00:00
|
|
|
(let (diff3-job diff-program diff-options ok-regexp diff-list)
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq diff3-job ediff-3way-job
|
|
|
|
|
diff-program (if diff3-job ediff-diff3-program ediff-diff-program)
|
1996-05-06 23:17:23 +00:00
|
|
|
diff-options (if diff3-job ediff-diff3-options ediff-diff-options)
|
1995-03-16 22:34:51 +00:00
|
|
|
ok-regexp (if diff3-job
|
|
|
|
|
ediff-diff3-ok-lines-regexp
|
|
|
|
|
ediff-diff-ok-lines-regexp))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-10-06 00:54:28 +00:00
|
|
|
(ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num))
|
|
|
|
|
(ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize
|
1996-05-06 23:17:23 +00:00
|
|
|
diff-options
|
1995-10-06 00:54:28 +00:00
|
|
|
;; The shuffle below is because we can compare 3-way
|
|
|
|
|
;; or in several 2-way fashions, like fA fC, fA fB,
|
|
|
|
|
;; or fB fC.
|
|
|
|
|
(if file-A file-A file-B)
|
|
|
|
|
(if file-B file-B file-A)
|
|
|
|
|
(if diff3-job
|
|
|
|
|
(if file-C file-C file-B))
|
|
|
|
|
) ; exec process
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-prepare-error-list ok-regexp ediff-fine-diff-buffer)
|
1996-02-16 06:36:35 +00:00
|
|
|
(ediff-message-if-verbose
|
|
|
|
|
"")
|
1995-10-06 00:54:28 +00:00
|
|
|
;; "Refining difference region %d ... done" (1+ reg-num))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq diff-list
|
|
|
|
|
(if diff3-job
|
|
|
|
|
(ediff-extract-diffs3
|
|
|
|
|
ediff-fine-diff-buffer '3way-comparison 'word-mode)
|
|
|
|
|
(ediff-extract-diffs ediff-fine-diff-buffer 'word-mode)))
|
|
|
|
|
;; fixup diff-list
|
|
|
|
|
(if diff3-job
|
|
|
|
|
(cond ((not file-A)
|
1999-11-01 07:16:15 +00:00
|
|
|
(mapcar (lambda (elt)
|
|
|
|
|
(aset elt 0 nil)
|
|
|
|
|
(aset elt 1 nil))
|
1995-03-16 22:34:51 +00:00
|
|
|
(cdr diff-list)))
|
|
|
|
|
((not file-B)
|
1999-11-01 07:16:15 +00:00
|
|
|
(mapcar (lambda (elt)
|
|
|
|
|
(aset elt 2 nil)
|
|
|
|
|
(aset elt 3 nil))
|
1995-03-16 22:34:51 +00:00
|
|
|
(cdr diff-list)))
|
|
|
|
|
((not file-C)
|
1999-11-01 07:16:15 +00:00
|
|
|
(mapcar (lambda (elt)
|
|
|
|
|
(aset elt 4 nil)
|
|
|
|
|
(aset elt 5 nil))
|
1995-03-16 22:34:51 +00:00
|
|
|
(cdr diff-list)))
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-convert-fine-diffs-to-overlays diff-list reg-num)
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-prepare-error-list (ok-regexp diff-buff)
|
1995-10-06 00:54:28 +00:00
|
|
|
(or (ediff-buffer-live-p ediff-error-buffer)
|
|
|
|
|
(setq ediff-error-buffer
|
|
|
|
|
(get-buffer-create (ediff-unique-buffer-name
|
|
|
|
|
"*ediff-errors" "*"))))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer ediff-error-buffer
|
1995-10-06 00:54:28 +00:00
|
|
|
(erase-buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(insert (ediff-with-current-buffer diff-buff (buffer-string)))
|
1995-10-06 00:54:28 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
(delete-matching-lines ok-regexp)
|
|
|
|
|
(if (memq system-type '(vax-vms axp-vms))
|
|
|
|
|
(delete-matching-lines "^$")))
|
|
|
|
|
;; If diff reports errors, show them then quit.
|
1997-07-31 04:04:23 +00:00
|
|
|
(if (/= 0 (ediff-with-current-buffer ediff-error-buffer (buffer-size)))
|
1995-10-06 00:54:28 +00:00
|
|
|
(let ((ctl-buf ediff-control-buffer)
|
|
|
|
|
(error-buf ediff-error-buffer))
|
|
|
|
|
(ediff-skip-unsuitable-frames)
|
|
|
|
|
(switch-to-buffer error-buf)
|
|
|
|
|
(ediff-kill-buffer-carefully ctl-buf)
|
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
|
|
|
(error "Errors in diff output. Diff output is in %S" diff-buff))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; BOUNDS specifies visibility bounds to use.
|
|
|
|
|
;; WORD-MODE tells whether we are in the word-mode or not.
|
|
|
|
|
;; If WORD-MODE, also construct vector of diffs using word numbers.
|
|
|
|
|
;; Else, use point values.
|
|
|
|
|
;; This function handles diff-2 jobs including the case of
|
|
|
|
|
;; merging buffers and files without ancestor.
|
|
|
|
|
(defun ediff-extract-diffs (diff-buffer word-mode &optional bounds)
|
|
|
|
|
(let ((A-buffer ediff-buffer-A)
|
|
|
|
|
(B-buffer ediff-buffer-B)
|
|
|
|
|
(C-buffer ediff-buffer-C)
|
|
|
|
|
(a-prev 1) ; this is needed to set the first diff line correctly
|
|
|
|
|
(b-prev 1)
|
|
|
|
|
(c-prev 1)
|
|
|
|
|
diff-list shift-A shift-B
|
|
|
|
|
)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; diff list contains word numbers, unless changed later
|
|
|
|
|
(setq diff-list (cons (if word-mode 'words 'points)
|
|
|
|
|
diff-list))
|
|
|
|
|
;; we don't use visibility bounds for buffer C when merging
|
|
|
|
|
(if bounds
|
|
|
|
|
(setq shift-A
|
|
|
|
|
(ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type 'A bounds))
|
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
|
|
|
shift-B
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type 'B bounds))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; reset point in buffers A/B/C
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer A-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (if shift-A shift-A (point-min))))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer B-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (if shift-B shift-B (point-min))))
|
|
|
|
|
(if (ediff-buffer-live-p C-buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer C-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (point-min))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer diff-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward ediff-match-diff-line nil t)
|
|
|
|
|
(let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
|
|
|
|
|
(match-end 1))))
|
|
|
|
|
(a-end (let ((b (match-beginning 3))
|
|
|
|
|
(e (match-end 3)))
|
|
|
|
|
(if b
|
|
|
|
|
(string-to-int (buffer-substring b e))
|
|
|
|
|
a-begin)))
|
|
|
|
|
(diff-type (buffer-substring (match-beginning 4) (match-end 4)))
|
|
|
|
|
(b-begin (string-to-int (buffer-substring (match-beginning 5)
|
|
|
|
|
(match-end 5))))
|
|
|
|
|
(b-end (let ((b (match-beginning 7))
|
|
|
|
|
(e (match-end 7)))
|
|
|
|
|
(if b
|
|
|
|
|
(string-to-int (buffer-substring b e))
|
|
|
|
|
b-begin)))
|
|
|
|
|
a-begin-pt a-end-pt b-begin-pt b-end-pt
|
|
|
|
|
c-begin c-end c-begin-pt c-end-pt)
|
|
|
|
|
;; fix the beginning and end numbers, because diff is somewhat
|
|
|
|
|
;; strange about how it numbers lines
|
|
|
|
|
(if (string-equal diff-type "a")
|
|
|
|
|
(setq b-end (1+ b-end)
|
|
|
|
|
a-begin (1+ a-begin)
|
|
|
|
|
a-end a-begin)
|
|
|
|
|
(if (string-equal diff-type "d")
|
|
|
|
|
(setq a-end (1+ a-end)
|
|
|
|
|
b-begin (1+ b-begin)
|
|
|
|
|
b-end b-begin)
|
|
|
|
|
;; (string-equal diff-type "c")
|
|
|
|
|
(setq a-end (1+ a-end)
|
|
|
|
|
b-end (1+ b-end))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (eq ediff-default-variant 'default-B)
|
|
|
|
|
(setq c-begin b-begin
|
|
|
|
|
c-end b-end)
|
|
|
|
|
(setq c-begin a-begin
|
|
|
|
|
c-end a-end))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; compute main diff vector
|
|
|
|
|
(if word-mode
|
|
|
|
|
;; make diff-list contain word numbers
|
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
|
|
|
(setq diff-list
|
1995-03-16 22:34:51 +00:00
|
|
|
(nconc diff-list
|
|
|
|
|
(list
|
|
|
|
|
(if (ediff-buffer-live-p C-buffer)
|
|
|
|
|
(vector (- a-begin a-prev) (- a-end a-begin)
|
|
|
|
|
(- b-begin b-prev) (- b-end b-begin)
|
|
|
|
|
(- c-begin c-prev) (- c-end c-begin)
|
1995-10-06 00:54:28 +00:00
|
|
|
nil nil ; dummy ancestor
|
|
|
|
|
nil ; state of diff
|
|
|
|
|
nil ; state of merge
|
|
|
|
|
nil ; state of ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
)
|
|
|
|
|
(vector (- a-begin a-prev) (- a-end a-begin)
|
|
|
|
|
(- b-begin b-prev) (- b-end b-begin)
|
|
|
|
|
nil nil ; dummy buf C
|
1995-10-06 00:54:28 +00:00
|
|
|
nil nil ; dummy ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
nil ; state of diff
|
|
|
|
|
nil ; state of merge
|
1995-10-06 00:54:28 +00:00
|
|
|
nil ; state of ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
|
|
|
|
))
|
|
|
|
|
a-prev a-end
|
|
|
|
|
b-prev b-end
|
|
|
|
|
c-prev c-end)
|
|
|
|
|
;; else convert lines to points
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer A-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(forward-line (- a-begin a-prev))
|
|
|
|
|
(setq a-begin-pt (point))
|
|
|
|
|
(forward-line (- a-end a-begin))
|
|
|
|
|
(setq a-end-pt (point)
|
|
|
|
|
a-prev a-end))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer B-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(forward-line (- b-begin b-prev))
|
|
|
|
|
(setq b-begin-pt (point))
|
|
|
|
|
(forward-line (- b-end b-begin))
|
|
|
|
|
(setq b-end-pt (point)
|
|
|
|
|
b-prev b-end))
|
|
|
|
|
(if (ediff-buffer-live-p C-buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer C-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(forward-line (- c-begin c-prev))
|
|
|
|
|
(setq c-begin-pt (point))
|
|
|
|
|
(forward-line (- c-end c-begin))
|
|
|
|
|
(setq c-end-pt (point)
|
|
|
|
|
c-prev c-end)))
|
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
|
|
|
(setq diff-list
|
1995-03-16 22:34:51 +00:00
|
|
|
(nconc
|
|
|
|
|
diff-list
|
|
|
|
|
(list
|
|
|
|
|
(if (ediff-buffer-live-p C-buffer)
|
|
|
|
|
(vector
|
|
|
|
|
a-begin-pt a-end-pt b-begin-pt b-end-pt
|
|
|
|
|
c-begin-pt c-end-pt
|
1995-10-06 00:54:28 +00:00
|
|
|
nil nil ; dummy ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
;; state of diff
|
|
|
|
|
;; shows which buff is different from the other two
|
|
|
|
|
(if (eq ediff-default-variant 'default-B) 'A 'B)
|
1995-10-06 00:54:28 +00:00
|
|
|
ediff-default-variant ; state of merge
|
|
|
|
|
nil ; state of ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
)
|
1995-10-06 00:54:28 +00:00
|
|
|
(vector a-begin-pt a-end-pt
|
|
|
|
|
b-begin-pt b-end-pt
|
|
|
|
|
nil nil ; dummy buf C
|
|
|
|
|
nil nil ; dummy ancestor
|
|
|
|
|
nil nil ; dummy state of diff & merge
|
|
|
|
|
nil ; dummy state of ancestor
|
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
|
|
|
)))
|
1995-03-16 22:34:51 +00:00
|
|
|
)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
))) ; end ediff-with-current-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
diff-list
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1995-10-06 00:54:28 +00:00
|
|
|
(defun ediff-convert-diffs-to-overlays (diff-list)
|
|
|
|
|
(ediff-set-diff-overlays-in-one-buffer 'A diff-list)
|
|
|
|
|
(ediff-set-diff-overlays-in-one-buffer 'B diff-list)
|
|
|
|
|
(if ediff-3way-job
|
|
|
|
|
(ediff-set-diff-overlays-in-one-buffer 'C diff-list))
|
|
|
|
|
(if ediff-merge-with-ancestor-job
|
|
|
|
|
(ediff-set-diff-overlays-in-one-buffer 'Ancestor diff-list))
|
|
|
|
|
;; set up vector showing the status of merge regions
|
|
|
|
|
(if ediff-merge-job
|
|
|
|
|
(setq ediff-state-of-merge
|
|
|
|
|
(vconcat
|
1999-11-01 07:16:15 +00:00
|
|
|
(mapcar (lambda (elt)
|
|
|
|
|
(let ((state-of-merge (aref elt 9))
|
|
|
|
|
(state-of-ancestor (aref elt 10)))
|
|
|
|
|
(vector
|
|
|
|
|
;; state of merge: prefers/default-A/B or combined
|
|
|
|
|
(if state-of-merge (format "%S" state-of-merge))
|
|
|
|
|
;; whether the ancestor region is empty
|
|
|
|
|
state-of-ancestor)))
|
1995-10-06 00:54:28 +00:00
|
|
|
;; the first elt designates type of list
|
|
|
|
|
(cdr diff-list))
|
|
|
|
|
)))
|
|
|
|
|
(message "Processing difference regions ... done"))
|
|
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list)
|
|
|
|
|
(let* ((current-diff -1)
|
|
|
|
|
(buff (ediff-get-buffer buf-type))
|
2005-02-19 04:46:24 +00:00
|
|
|
(ctl-buf ediff-control-buffer)
|
1995-03-16 22:34:51 +00:00
|
|
|
;; ediff-extract-diffs puts the type of diff-list as the first elt
|
|
|
|
|
;; of this list. The type is either 'points or 'words
|
|
|
|
|
(diff-list-type (car diff-list))
|
|
|
|
|
(shift (ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type
|
|
|
|
|
buf-type ediff-narrow-bounds)))
|
|
|
|
|
(limit (ediff-overlay-end
|
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-get-value-according-to-buffer-type
|
1995-03-16 22:34:51 +00:00
|
|
|
buf-type ediff-narrow-bounds)))
|
|
|
|
|
diff-overlay-list list-element total-diffs
|
1995-10-06 00:54:28 +00:00
|
|
|
begin end pt-saved overlay state-of-diff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(setq diff-list (cdr diff-list)) ; discard diff list type
|
|
|
|
|
(setq total-diffs (length diff-list))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; shift, if necessary
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer buff (setq pt-saved shift))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(while diff-list
|
|
|
|
|
(setq current-diff (1+ current-diff)
|
|
|
|
|
list-element (car diff-list)
|
|
|
|
|
begin (aref list-element (cond ((eq buf-type 'A) 0)
|
|
|
|
|
((eq buf-type 'B) 2)
|
1995-10-06 00:54:28 +00:00
|
|
|
((eq buf-type 'C) 4)
|
|
|
|
|
(t 6))) ; Ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
end (aref list-element (cond ((eq buf-type 'A) 1)
|
|
|
|
|
((eq buf-type 'B) 3)
|
1995-10-06 00:54:28 +00:00
|
|
|
((eq buf-type 'C) 5)
|
|
|
|
|
(t 7))) ; Ancestor
|
|
|
|
|
state-of-diff (aref list-element 8)
|
|
|
|
|
)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(cond ((and (not (eq buf-type state-of-diff))
|
1995-10-06 00:54:28 +00:00
|
|
|
(not (eq buf-type 'Ancestor))
|
1995-03-16 22:34:51 +00:00
|
|
|
(memq state-of-diff '(A B C)))
|
|
|
|
|
(setq state-of-diff
|
|
|
|
|
(car (delq buf-type (delq state-of-diff (list 'A 'B 'C)))))
|
|
|
|
|
(setq state-of-diff (format "=diff(%S)" state-of-diff))
|
|
|
|
|
)
|
1995-10-06 00:54:28 +00:00
|
|
|
(t (setq state-of-diff nil)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Put overlays at appropriate places in buffer
|
|
|
|
|
;; convert word numbers to points, if necessary
|
|
|
|
|
(if (eq diff-list-type 'words)
|
|
|
|
|
(progn
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer buff (goto-char pt-saved))
|
2005-02-19 04:46:24 +00:00
|
|
|
(ediff-with-current-buffer ctl-buf
|
|
|
|
|
(setq begin (ediff-goto-word (1+ begin) buff)
|
|
|
|
|
end (ediff-goto-word end buff 'end)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (> end limit) (setq end limit))
|
|
|
|
|
(if (> begin end) (setq begin end))
|
1997-07-31 04:04:23 +00:00
|
|
|
(setq pt-saved (ediff-with-current-buffer buff (point)))))
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq overlay (ediff-make-bullet-proof-overlay begin end buff))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority)
|
|
|
|
|
(ediff-overlay-put overlay 'ediff-diff-num current-diff)
|
1996-02-16 06:36:35 +00:00
|
|
|
(if (and (ediff-has-face-support-p)
|
1995-10-06 00:54:28 +00:00
|
|
|
ediff-use-faces ediff-highlight-all-diffs)
|
|
|
|
|
(ediff-set-overlay-face
|
|
|
|
|
overlay (ediff-background-face buf-type current-diff)))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(if (= 0 (mod current-diff 10))
|
|
|
|
|
(message "Buffer %S: Processing difference region %d of %d"
|
|
|
|
|
buf-type current-diff total-diffs))
|
1999-11-01 07:16:15 +00:00
|
|
|
;; Record all overlays for this difference.
|
|
|
|
|
;; The 2-d elt, nil, is a place holder for the fine diff vector.
|
|
|
|
|
;; The 3-d elt, nil, is a place holder for no-fine-diffs flag.
|
|
|
|
|
;; The 4-th elt says which diff region is different from the other two
|
|
|
|
|
;; (3-way jobs only).
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq diff-overlay-list
|
|
|
|
|
(nconc
|
|
|
|
|
diff-overlay-list
|
1995-10-06 00:54:28 +00:00
|
|
|
(list (vector overlay nil nil state-of-diff)))
|
1995-03-16 22:34:51 +00:00
|
|
|
diff-list
|
|
|
|
|
(cdr diff-list))
|
|
|
|
|
) ; while
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
(set (ediff-get-symbol-from-alist buf-type ediff-difference-vector-alist)
|
1995-10-06 00:54:28 +00:00
|
|
|
(vconcat diff-overlay-list))
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
1995-10-06 00:54:28 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; `n' is the diff region to work on. Default is ediff-current-difference.
|
|
|
|
|
;; if `flag' is 'noforce then make fine-diffs only if this region's fine
|
|
|
|
|
;; diffs have not been computed before.
|
|
|
|
|
;; if `flag' is 'skip then don't compute fine diffs for this region.
|
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
|
|
|
(defun ediff-make-fine-diffs (&optional n flag)
|
1995-03-16 22:34:51 +00:00
|
|
|
(or n (setq n ediff-current-difference))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (< ediff-number-of-differences 1)
|
1996-06-22 01:54:34 +00:00
|
|
|
(error ediff-NO-DIFFERENCES))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if ediff-word-mode
|
|
|
|
|
(setq flag 'skip
|
|
|
|
|
ediff-auto-refine 'nix))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(or (< n 0)
|
|
|
|
|
(>= n ediff-number-of-differences)
|
|
|
|
|
;; n is within the range
|
|
|
|
|
(let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
|
|
|
|
|
(file-A ediff-temp-file-A)
|
|
|
|
|
(file-B ediff-temp-file-B)
|
|
|
|
|
(file-C ediff-temp-file-C)
|
|
|
|
|
(empty-A (ediff-empty-diff-region-p n 'A))
|
|
|
|
|
(empty-B (ediff-empty-diff-region-p n 'B))
|
|
|
|
|
(empty-C (ediff-empty-diff-region-p n 'C))
|
|
|
|
|
(whitespace-A (ediff-whitespace-diff-region-p n 'A))
|
|
|
|
|
(whitespace-B (ediff-whitespace-diff-region-p n 'B))
|
|
|
|
|
(whitespace-C (ediff-whitespace-diff-region-p n 'C))
|
|
|
|
|
cumulative-fine-diff-length)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(cond ;; If one of the regions is empty (or 2 in 3way comparison)
|
1995-10-06 00:54:28 +00:00
|
|
|
;; then don't refine.
|
|
|
|
|
;; If the region happens to be entirely whitespace or empty then
|
|
|
|
|
;; mark as such.
|
1995-03-16 22:34:51 +00:00
|
|
|
((> (length (delq nil (list empty-A empty-B empty-C))) 1)
|
|
|
|
|
(if (and (ediff-looks-like-combined-merge n)
|
|
|
|
|
ediff-merge-job)
|
|
|
|
|
(ediff-set-fine-overlays-in-one-buffer 'C nil n))
|
1995-10-06 00:54:28 +00:00
|
|
|
(if ediff-3way-comparison-job
|
|
|
|
|
(ediff-message-if-verbose
|
|
|
|
|
"Region %d is empty in all buffers but %S"
|
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
|
|
|
(1+ n)
|
1995-10-06 00:54:28 +00:00
|
|
|
(cond ((not empty-A) 'A)
|
|
|
|
|
((not empty-B) 'B)
|
|
|
|
|
((not empty-C) 'C)))
|
|
|
|
|
(ediff-message-if-verbose
|
|
|
|
|
"Region %d in buffer %S is empty"
|
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
|
|
|
(1+ n)
|
1995-10-06 00:54:28 +00:00
|
|
|
(cond (empty-A 'A)
|
|
|
|
|
(empty-B 'B)
|
|
|
|
|
(empty-C 'C)))
|
|
|
|
|
)
|
1996-06-22 01:54:34 +00:00
|
|
|
;; if all regions happen to be whitespace
|
1995-10-06 00:54:28 +00:00
|
|
|
(if (and whitespace-A whitespace-B whitespace-C)
|
1996-06-22 01:54:34 +00:00
|
|
|
;; mark as space only
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-mark-diff-as-space-only n t)
|
1996-06-22 01:54:34 +00:00
|
|
|
;; if some regions are white and others don't, then mark as
|
|
|
|
|
;; non-white-space-only
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-mark-diff-as-space-only n nil)))
|
1997-05-31 01:10:39 +00:00
|
|
|
|
|
|
|
|
;; don't compute fine diffs if diff vector exists
|
|
|
|
|
((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A))
|
|
|
|
|
(if (ediff-no-fine-diffs-p n)
|
|
|
|
|
(message
|
|
|
|
|
"Only white-space differences in region %d %s"
|
|
|
|
|
(1+ n)
|
|
|
|
|
(cond ((eq (ediff-no-fine-diffs-p n) 'A)
|
|
|
|
|
"in buffers B & C")
|
|
|
|
|
((eq (ediff-no-fine-diffs-p n) 'B)
|
|
|
|
|
"in buffers A & C")
|
|
|
|
|
((eq (ediff-no-fine-diffs-p n) 'C)
|
|
|
|
|
"in buffers A & B")
|
|
|
|
|
(t "")))))
|
1995-03-16 22:34:51 +00:00
|
|
|
;; don't compute fine diffs for this region
|
|
|
|
|
((eq flag 'skip)
|
|
|
|
|
(or (ediff-get-fine-diff-vector n 'A)
|
|
|
|
|
(memq ediff-auto-refine '(off nix))
|
1995-10-06 00:54:28 +00:00
|
|
|
(ediff-message-if-verbose
|
1999-11-01 07:16:15 +00:00
|
|
|
"Region %d exceeds the auto-refinement limit. Type `%s' to refine"
|
1995-03-16 22:34:51 +00:00
|
|
|
(1+ n)
|
1995-10-06 00:54:28 +00:00
|
|
|
(substitute-command-keys
|
|
|
|
|
"\\[ediff-make-or-kill-fine-diffs]")
|
1995-03-16 22:34:51 +00:00
|
|
|
)))
|
|
|
|
|
(t
|
|
|
|
|
;; recompute fine diffs
|
|
|
|
|
(ediff-wordify
|
|
|
|
|
(ediff-get-diff-posn 'A 'beg n)
|
|
|
|
|
(ediff-get-diff-posn 'A 'end n)
|
|
|
|
|
ediff-buffer-A
|
|
|
|
|
tmp-buffer
|
|
|
|
|
ediff-control-buffer)
|
1995-10-06 00:54:28 +00:00
|
|
|
(setq file-A
|
|
|
|
|
(ediff-make-temp-file tmp-buffer "fineDiffA" file-A))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-wordify
|
|
|
|
|
(ediff-get-diff-posn 'B 'beg n)
|
|
|
|
|
(ediff-get-diff-posn 'B 'end n)
|
|
|
|
|
ediff-buffer-B
|
|
|
|
|
tmp-buffer
|
|
|
|
|
ediff-control-buffer)
|
1995-10-06 00:54:28 +00:00
|
|
|
(setq file-B
|
|
|
|
|
(ediff-make-temp-file tmp-buffer "fineDiffB" file-B))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if ediff-3way-job
|
|
|
|
|
(progn
|
|
|
|
|
(ediff-wordify
|
|
|
|
|
(ediff-get-diff-posn 'C 'beg n)
|
|
|
|
|
(ediff-get-diff-posn 'C 'end n)
|
|
|
|
|
ediff-buffer-C
|
|
|
|
|
tmp-buffer
|
|
|
|
|
ediff-control-buffer)
|
1995-10-06 00:54:28 +00:00
|
|
|
(setq file-C
|
|
|
|
|
(ediff-make-temp-file
|
|
|
|
|
tmp-buffer "fineDiffC" file-C))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; save temp file names.
|
|
|
|
|
(setq ediff-temp-file-A file-A
|
|
|
|
|
ediff-temp-file-B file-B
|
|
|
|
|
ediff-temp-file-C file-C)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; set the new vector of fine diffs, if none exists
|
|
|
|
|
(cond ((and ediff-3way-job whitespace-A)
|
|
|
|
|
(ediff-setup-fine-diff-regions nil file-B file-C n))
|
|
|
|
|
((and ediff-3way-job whitespace-B)
|
|
|
|
|
(ediff-setup-fine-diff-regions file-A nil file-C n))
|
|
|
|
|
((and ediff-3way-job
|
1996-06-22 01:54:34 +00:00
|
|
|
;; In merge-jobs, whitespace-C is t, since
|
|
|
|
|
;; ediff-empty-diff-region-p returns t in this case
|
|
|
|
|
whitespace-C)
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-setup-fine-diff-regions file-A file-B nil n))
|
|
|
|
|
(t
|
|
|
|
|
(ediff-setup-fine-diff-regions file-A file-B file-C n)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq cumulative-fine-diff-length
|
|
|
|
|
(+ (length (ediff-get-fine-diff-vector n 'A))
|
1996-06-22 01:54:34 +00:00
|
|
|
(length (ediff-get-fine-diff-vector n 'B))
|
|
|
|
|
;; in merge jobs, the merge buffer is never refined
|
|
|
|
|
(if (and file-C (not ediff-merge-job))
|
|
|
|
|
(length (ediff-get-fine-diff-vector n 'C))
|
|
|
|
|
0)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(cond ((or
|
|
|
|
|
;; all regions are white space
|
|
|
|
|
(and whitespace-A whitespace-B whitespace-C)
|
|
|
|
|
;; none is white space and no fine diffs detected
|
|
|
|
|
(and (not whitespace-A)
|
|
|
|
|
(not whitespace-B)
|
|
|
|
|
(not (and ediff-3way-job whitespace-C))
|
|
|
|
|
(eq cumulative-fine-diff-length 0)))
|
|
|
|
|
(ediff-mark-diff-as-space-only n t)
|
1995-10-06 00:54:28 +00:00
|
|
|
(ediff-message-if-verbose
|
1995-03-16 22:34:51 +00:00
|
|
|
"Only white-space differences in region %d" (1+ n)))
|
|
|
|
|
((eq cumulative-fine-diff-length 0)
|
1995-10-06 00:54:28 +00:00
|
|
|
(ediff-message-if-verbose
|
1995-03-16 22:34:51 +00:00
|
|
|
"Only white-space differences in region %d %s"
|
|
|
|
|
(1+ n)
|
1997-05-31 01:10:39 +00:00
|
|
|
(cond (whitespace-A (ediff-mark-diff-as-space-only n 'A)
|
|
|
|
|
"in buffers B & C")
|
|
|
|
|
(whitespace-B (ediff-mark-diff-as-space-only n 'B)
|
|
|
|
|
"in buffers A & C")
|
|
|
|
|
(whitespace-C (ediff-mark-diff-as-space-only n 'C)
|
|
|
|
|
"in buffers A & B"))))
|
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
|
|
|
(t
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-mark-diff-as-space-only n nil)))
|
|
|
|
|
)
|
|
|
|
|
) ; end cond
|
|
|
|
|
(ediff-set-fine-diff-properties n)
|
|
|
|
|
)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc.
|
|
|
|
|
(defun ediff-install-fine-diff-if-necessary (n)
|
2002-03-20 06:36:18 +00:00
|
|
|
(cond ((and (eq ediff-auto-refine 'on)
|
|
|
|
|
ediff-use-faces
|
|
|
|
|
(not (eq ediff-highlighting-style 'off))
|
|
|
|
|
(not (eq ediff-highlighting-style 'ascii)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (and
|
|
|
|
|
(> ediff-auto-refine-limit
|
|
|
|
|
(- (ediff-get-diff-posn 'A 'end n)
|
|
|
|
|
(ediff-get-diff-posn 'A 'beg n)))
|
|
|
|
|
(> ediff-auto-refine-limit
|
|
|
|
|
(- (ediff-get-diff-posn 'B 'end n)
|
|
|
|
|
(ediff-get-diff-posn 'B 'beg n))))
|
|
|
|
|
(ediff-make-fine-diffs n 'noforce)
|
|
|
|
|
(ediff-make-fine-diffs n 'skip)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; highlight iff fine diffs already exist
|
|
|
|
|
((eq ediff-auto-refine 'off)
|
|
|
|
|
(ediff-make-fine-diffs n 'skip))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; if fine diff vector is not set for diff N, then do nothing
|
|
|
|
|
(defun ediff-set-fine-diff-properties (n &optional default)
|
1996-02-16 06:36:35 +00:00
|
|
|
(or (not (ediff-has-face-support-p))
|
1995-03-16 22:34:51 +00:00
|
|
|
(< n 0)
|
|
|
|
|
(>= n ediff-number-of-differences)
|
1996-02-16 06:36:35 +00:00
|
|
|
;; when faces are supported, set faces and priorities of fine overlays
|
1995-03-16 22:34:51 +00:00
|
|
|
(progn
|
|
|
|
|
(ediff-set-fine-diff-properties-in-one-buffer 'A n default)
|
|
|
|
|
(ediff-set-fine-diff-properties-in-one-buffer 'B n default)
|
|
|
|
|
(if ediff-3way-job
|
|
|
|
|
(ediff-set-fine-diff-properties-in-one-buffer 'C n default)))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-set-fine-diff-properties-in-one-buffer (buf-type
|
|
|
|
|
n &optional default)
|
|
|
|
|
(let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type))
|
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
|
|
|
(face (if default
|
1995-03-16 22:34:51 +00:00
|
|
|
'default
|
|
|
|
|
(face-name
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-get-symbol-from-alist
|
|
|
|
|
buf-type ediff-fine-diff-face-alist))))
|
1995-03-16 22:34:51 +00:00
|
|
|
(priority (if default
|
|
|
|
|
0
|
|
|
|
|
(1+ (or (ediff-overlay-get
|
|
|
|
|
(symbol-value
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-get-symbol-from-alist
|
|
|
|
|
buf-type
|
|
|
|
|
ediff-current-diff-overlay-alist))
|
1995-03-16 22:34:51 +00:00
|
|
|
'priority)
|
|
|
|
|
0)))))
|
1999-11-01 07:16:15 +00:00
|
|
|
(mapcar (lambda (overl)
|
|
|
|
|
(ediff-set-overlay-face overl face)
|
|
|
|
|
(ediff-overlay-put overl 'priority priority))
|
|
|
|
|
fine-diff-vector)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1999-11-25 04:34:23 +00:00
|
|
|
;; Set overlays over the regions that denote delimiters
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)
|
1999-11-25 04:34:23 +00:00
|
|
|
(let (overlay overlay-list)
|
|
|
|
|
(while diff-list
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(setq overlay
|
|
|
|
|
(ediff-make-bullet-proof-overlay
|
|
|
|
|
(nth 0 diff-list) (nth 1 diff-list) ediff-buffer-C))
|
|
|
|
|
(error ""))
|
|
|
|
|
(setq overlay-list (cons overlay overlay-list))
|
|
|
|
|
(if (> (length diff-list) 1)
|
|
|
|
|
(setq diff-list (cdr (cdr diff-list)))
|
|
|
|
|
(error "ediff-set-fine-overlays-for-combined-merge: corrupt list of
|
|
|
|
|
delimiter regions"))
|
|
|
|
|
)
|
|
|
|
|
(setq overlay-list (reverse overlay-list))
|
|
|
|
|
(ediff-set-fine-diff-vector
|
|
|
|
|
reg-num 'C (apply 'vector overlay-list))
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Convert diff list to overlays for a given DIFF-REGION
|
|
|
|
|
;; in buffer of type BUF-TYPE
|
|
|
|
|
(defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num)
|
|
|
|
|
(let* ((current-diff -1)
|
|
|
|
|
(reg-start (ediff-get-diff-posn buf-type 'beg region-num))
|
|
|
|
|
(buff (ediff-get-buffer buf-type))
|
2005-02-19 04:46:24 +00:00
|
|
|
(ctl-buf ediff-control-buffer)
|
1995-03-16 22:34:51 +00:00
|
|
|
combined-merge-diff-list
|
|
|
|
|
diff-overlay-list list-element
|
|
|
|
|
begin end overlay)
|
|
|
|
|
|
|
|
|
|
(ediff-clear-fine-differences-in-one-buffer region-num buf-type)
|
|
|
|
|
(setq diff-list (cdr diff-list)) ; discard list type (words or points)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer buff (goto-char reg-start))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; if it is a combined merge then set overlays in buff C specially
|
|
|
|
|
(if (and ediff-merge-job (eq buf-type 'C)
|
|
|
|
|
(setq combined-merge-diff-list
|
|
|
|
|
(ediff-looks-like-combined-merge region-num)))
|
|
|
|
|
(ediff-set-fine-overlays-for-combined-merge
|
|
|
|
|
combined-merge-diff-list region-num)
|
|
|
|
|
;; regular fine diff
|
|
|
|
|
(while diff-list
|
|
|
|
|
(setq current-diff (1+ current-diff)
|
|
|
|
|
list-element (car diff-list)
|
|
|
|
|
begin (aref list-element (cond ((eq buf-type 'A) 0)
|
|
|
|
|
((eq buf-type 'B) 2)
|
|
|
|
|
(t 4))) ; buf C
|
|
|
|
|
end (aref list-element (cond ((eq buf-type 'A) 1)
|
|
|
|
|
((eq buf-type 'B) 3)
|
|
|
|
|
(t 5)))) ; buf C
|
|
|
|
|
(if (not (or begin end))
|
|
|
|
|
() ; skip this diff
|
|
|
|
|
;; Put overlays at appropriate places in buffers
|
|
|
|
|
;; convert lines to points, if necessary
|
2005-02-19 04:46:24 +00:00
|
|
|
(ediff-with-current-buffer ctl-buf
|
|
|
|
|
(setq begin (ediff-goto-word (1+ begin) buff)
|
|
|
|
|
end (ediff-goto-word end buff 'end)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq overlay (ediff-make-bullet-proof-overlay begin end buff))
|
|
|
|
|
;; record all overlays for this difference region
|
|
|
|
|
(setq diff-overlay-list (nconc diff-overlay-list (list overlay))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq diff-list (cdr diff-list))
|
|
|
|
|
) ; while
|
|
|
|
|
;; convert the list of difference information into a vector
|
|
|
|
|
;; for fast access
|
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-set-fine-diff-vector
|
1995-10-06 00:54:28 +00:00
|
|
|
region-num buf-type (vconcat diff-overlay-list))
|
1995-03-16 22:34:51 +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
|
|
|
(defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num)
|
|
|
|
|
(ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num)
|
|
|
|
|
(ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num)
|
|
|
|
|
(if ediff-3way-job
|
|
|
|
|
(ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num)
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Stolen from emerge.el
|
|
|
|
|
(defun ediff-get-diff3-group (file)
|
|
|
|
|
;; This save-excursion allows ediff-get-diff3-group to be called for the
|
|
|
|
|
;; various groups of lines (1, 2, 3) in any order, and for the lines to
|
|
|
|
|
;; appear in any order. The reason this is necessary is that Gnu diff3
|
|
|
|
|
;; can produce the groups in the order 1, 2, 3 or 1, 3, 2.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(re-search-forward
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
(concat "^" file ":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)\C-m?$"))
|
1995-03-16 22:34:51 +00:00
|
|
|
(beginning-of-line 2)
|
|
|
|
|
;; treatment depends on whether it is an "a" group or a "c" group
|
|
|
|
|
(if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
|
|
|
|
|
;; it is a "c" group
|
|
|
|
|
(if (match-beginning 2)
|
|
|
|
|
;; it has two numbers
|
|
|
|
|
(list (string-to-int
|
|
|
|
|
(buffer-substring (match-beginning 1) (match-end 1)))
|
|
|
|
|
(1+ (string-to-int
|
|
|
|
|
(buffer-substring (match-beginning 3) (match-end 3)))))
|
|
|
|
|
;; it has one number
|
|
|
|
|
(let ((x (string-to-int
|
|
|
|
|
(buffer-substring (match-beginning 1) (match-end 1)))))
|
|
|
|
|
(list x (1+ x))))
|
|
|
|
|
;; it is an "a" group
|
|
|
|
|
(let ((x (1+ (string-to-int
|
|
|
|
|
(buffer-substring (match-beginning 1) (match-end 1))))))
|
|
|
|
|
(list x x)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; If WORD-MODE, construct vector of diffs using word numbers.
|
|
|
|
|
;; Else, use point values.
|
|
|
|
|
;; WORD-MODE also tells if we are in the word-mode or not.
|
|
|
|
|
;; If THREE-WAY-COMP, then it is a 3-way comparison. Else, it is merging
|
1995-10-06 00:54:28 +00:00
|
|
|
;; with ancestor, in which case buffer-C contents is identical to buffer-A/B,
|
|
|
|
|
;; contents (unless buffer-A is narrowed) depending on ediff-default-variant's
|
|
|
|
|
;; value.
|
1995-03-16 22:34:51 +00:00
|
|
|
;; BOUNDS specifies visibility bounds to use.
|
|
|
|
|
(defun ediff-extract-diffs3 (diff-buffer word-mode three-way-comp
|
|
|
|
|
&optional bounds)
|
|
|
|
|
(let ((A-buffer ediff-buffer-A)
|
|
|
|
|
(B-buffer ediff-buffer-B)
|
|
|
|
|
(C-buffer ediff-buffer-C)
|
1995-10-06 00:54:28 +00:00
|
|
|
(anc-buffer ediff-ancestor-buffer)
|
1995-03-16 22:34:51 +00:00
|
|
|
(a-prev 1) ; needed to set the first diff line correctly
|
|
|
|
|
(b-prev 1)
|
|
|
|
|
(c-prev 1)
|
1995-10-06 00:54:28 +00:00
|
|
|
(anc-prev 1)
|
1995-03-16 22:34:51 +00:00
|
|
|
diff-list shift-A shift-B shift-C
|
|
|
|
|
)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; diff list contains word numbers or points, depending on word-mode
|
|
|
|
|
(setq diff-list (cons (if word-mode 'words 'points)
|
|
|
|
|
diff-list))
|
|
|
|
|
(if bounds
|
|
|
|
|
(setq shift-A
|
|
|
|
|
(ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type 'A bounds))
|
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
|
|
|
shift-B
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type 'B bounds))
|
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
|
|
|
shift-C
|
1995-03-16 22:34:51 +00:00
|
|
|
(if three-way-comp
|
|
|
|
|
(ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type 'C bounds)))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; reset point in buffers A, B, C
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer A-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (if shift-A shift-A (point-min))))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer B-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (if shift-B shift-B (point-min))))
|
1995-10-06 00:54:28 +00:00
|
|
|
(if three-way-comp
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer C-buffer
|
1995-10-06 00:54:28 +00:00
|
|
|
(goto-char (if shift-C shift-C (point-min)))))
|
|
|
|
|
(if (ediff-buffer-live-p anc-buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer anc-buffer
|
1995-10-06 00:54:28 +00:00
|
|
|
(goto-char (point-min))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer diff-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward ediff-match-diff3-line nil t)
|
|
|
|
|
;; leave point after matched line
|
|
|
|
|
(beginning-of-line 2)
|
|
|
|
|
(let ((agreement (buffer-substring (match-beginning 1) (match-end 1))))
|
1996-06-22 01:54:34 +00:00
|
|
|
;; if the files A and B are the same and not 3way-comparison,
|
1995-03-16 22:34:51 +00:00
|
|
|
;; ignore the difference
|
|
|
|
|
(if (or three-way-comp (not (string-equal agreement "3")))
|
|
|
|
|
(let* ((a-begin (car (ediff-get-diff3-group "1")))
|
|
|
|
|
(a-end (nth 1 (ediff-get-diff3-group "1")))
|
|
|
|
|
(b-begin (car (ediff-get-diff3-group "2")))
|
|
|
|
|
(b-end (nth 1 (ediff-get-diff3-group "2")))
|
1995-10-06 00:54:28 +00:00
|
|
|
(c-or-anc-begin (car (ediff-get-diff3-group "3")))
|
|
|
|
|
(c-or-anc-end (nth 1 (ediff-get-diff3-group "3")))
|
1995-03-16 22:34:51 +00:00
|
|
|
(state-of-merge
|
|
|
|
|
(cond ((string-equal agreement "1") 'prefer-A)
|
|
|
|
|
((string-equal agreement "2") 'prefer-B)
|
|
|
|
|
(t ediff-default-variant)))
|
|
|
|
|
(state-of-diff-merge
|
|
|
|
|
(if (memq state-of-merge '(default-A prefer-A)) 'B 'A))
|
|
|
|
|
(state-of-diff-comparison
|
|
|
|
|
(cond ((string-equal agreement "1") 'A)
|
|
|
|
|
((string-equal agreement "2") 'B)
|
|
|
|
|
((string-equal agreement "3") 'C)))
|
1995-10-06 00:54:28 +00:00
|
|
|
state-of-ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
c-begin c-end
|
|
|
|
|
a-begin-pt a-end-pt
|
1995-10-06 00:54:28 +00:00
|
|
|
b-begin-pt b-end-pt
|
|
|
|
|
c-begin-pt c-end-pt
|
|
|
|
|
anc-begin-pt anc-end-pt)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-10-06 00:54:28 +00:00
|
|
|
(setq state-of-ancestor
|
|
|
|
|
(= c-or-anc-begin c-or-anc-end))
|
|
|
|
|
|
|
|
|
|
(cond (three-way-comp
|
|
|
|
|
(setq c-begin c-or-anc-begin
|
|
|
|
|
c-end c-or-anc-end))
|
|
|
|
|
((eq ediff-default-variant 'default-B)
|
|
|
|
|
(setq c-begin b-begin
|
|
|
|
|
c-end b-end))
|
|
|
|
|
(t
|
|
|
|
|
(setq c-begin a-begin
|
|
|
|
|
c-end a-end)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; compute main diff vector
|
|
|
|
|
(if word-mode
|
|
|
|
|
;; make diff-list contain word numbers
|
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
|
|
|
(setq diff-list
|
1995-03-16 22:34:51 +00:00
|
|
|
(nconc diff-list
|
|
|
|
|
(list (vector
|
|
|
|
|
(- a-begin a-prev) (- a-end a-begin)
|
|
|
|
|
(- b-begin b-prev) (- b-end b-begin)
|
|
|
|
|
(- c-begin c-prev) (- c-end c-begin)
|
1995-10-06 00:54:28 +00:00
|
|
|
nil nil ; dummy ancestor
|
|
|
|
|
nil ; state of diff
|
|
|
|
|
nil ; state of merge
|
|
|
|
|
nil ; state of ancestor
|
|
|
|
|
)))
|
1995-03-16 22:34:51 +00:00
|
|
|
a-prev a-end
|
|
|
|
|
b-prev b-end
|
|
|
|
|
c-prev c-end)
|
|
|
|
|
;; else convert lines to points
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer A-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(forward-line (- a-begin a-prev))
|
|
|
|
|
(setq a-begin-pt (point))
|
|
|
|
|
(forward-line (- a-end a-begin))
|
|
|
|
|
(setq a-end-pt (point)
|
|
|
|
|
a-prev a-end))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer B-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(forward-line (- b-begin b-prev))
|
|
|
|
|
(setq b-begin-pt (point))
|
|
|
|
|
(forward-line (- b-end b-begin))
|
|
|
|
|
(setq b-end-pt (point)
|
|
|
|
|
b-prev b-end))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer C-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(forward-line (- c-begin c-prev))
|
|
|
|
|
(setq c-begin-pt (point))
|
|
|
|
|
(forward-line (- c-end c-begin))
|
|
|
|
|
(setq c-end-pt (point)
|
|
|
|
|
c-prev c-end))
|
1995-10-06 00:54:28 +00:00
|
|
|
(if (ediff-buffer-live-p anc-buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer anc-buffer
|
1995-10-06 00:54:28 +00:00
|
|
|
(forward-line (- c-or-anc-begin anc-prev))
|
|
|
|
|
(setq anc-begin-pt (point))
|
|
|
|
|
(forward-line (- c-or-anc-end c-or-anc-begin))
|
|
|
|
|
(setq anc-end-pt (point)
|
|
|
|
|
anc-prev c-or-anc-end)))
|
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
|
|
|
(setq diff-list
|
1995-03-16 22:34:51 +00:00
|
|
|
(nconc
|
|
|
|
|
diff-list
|
|
|
|
|
;; if comparing with ancestor, then there also is a
|
|
|
|
|
;; state-of-difference marker
|
|
|
|
|
(if three-way-comp
|
|
|
|
|
(list (vector
|
|
|
|
|
a-begin-pt a-end-pt
|
|
|
|
|
b-begin-pt b-end-pt
|
|
|
|
|
c-begin-pt c-end-pt
|
1995-10-06 00:54:28 +00:00
|
|
|
nil nil ; ancestor begin/end
|
1995-03-16 22:34:51 +00:00
|
|
|
state-of-diff-comparison
|
1995-10-06 00:54:28 +00:00
|
|
|
nil ; state of merge
|
|
|
|
|
nil ; state of ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
|
|
|
|
(list (vector a-begin-pt a-end-pt
|
|
|
|
|
b-begin-pt b-end-pt
|
|
|
|
|
c-begin-pt c-end-pt
|
1995-10-06 00:54:28 +00:00
|
|
|
anc-begin-pt anc-end-pt
|
1995-03-16 22:34:51 +00:00
|
|
|
state-of-diff-merge
|
|
|
|
|
state-of-merge
|
1995-10-06 00:54:28 +00:00
|
|
|
state-of-ancestor
|
1995-03-16 22:34:51 +00:00
|
|
|
)))
|
|
|
|
|
)))
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
))) ; end ediff-with-current-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
diff-list
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Generate the difference vector and overlays for three files
|
|
|
|
|
;; File-C is either the third file to compare (in case of 3-way comparison)
|
|
|
|
|
;; or it is the ancestor file.
|
|
|
|
|
(defun ediff-setup-diff-regions3 (file-A file-B file-C)
|
|
|
|
|
(or (ediff-buffer-live-p ediff-diff-buffer)
|
|
|
|
|
(setq ediff-diff-buffer
|
|
|
|
|
(get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-10-06 00:54:28 +00:00
|
|
|
(message "Computing differences ...")
|
|
|
|
|
(ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize
|
|
|
|
|
ediff-diff3-options file-A file-B file-C)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer)
|
1995-10-06 00:54:28 +00:00
|
|
|
;;(message "Computing differences ... done")
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-convert-diffs-to-overlays
|
|
|
|
|
(ediff-extract-diffs3
|
|
|
|
|
ediff-diff-buffer
|
|
|
|
|
ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds)
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
;; Execute PROGRAM asynchronously, unless OS/2, Windows-*, or DOS, or unless
|
1997-07-31 04:04:23 +00:00
|
|
|
;; SYNCH is non-nil. BUFFER must be a buffer object, and must be alive. The
|
|
|
|
|
;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank
|
|
|
|
|
;; string. All elements in FILES must be strings. We also delete nil from
|
|
|
|
|
;; args.
|
|
|
|
|
(defun ediff-exec-process (program buffer synch options &rest files)
|
|
|
|
|
(let ((data (match-data))
|
2001-02-12 08:47:13 +00:00
|
|
|
(coding-system-for-read ediff-coding-system-for-read)
|
1997-07-31 04:04:23 +00:00
|
|
|
args)
|
|
|
|
|
(setq args (append (split-string options) files))
|
|
|
|
|
(setq args (delete "" (delq nil args))) ; delete nil and "" from arguments
|
2000-05-25 17:21:32 +00:00
|
|
|
;; the --binary option, if present, should be used only for buffer jobs
|
2000-06-05 00:07:02 +00:00
|
|
|
;; or for refining the differences
|
2000-05-25 17:21:32 +00:00
|
|
|
(or (string-match "buffer" (symbol-name ediff-job-name))
|
2000-06-05 00:07:02 +00:00
|
|
|
(eq buffer ediff-fine-diff-buffer)
|
2000-05-25 17:21:32 +00:00
|
|
|
(setq args (delete "--binary" args)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(unwind-protect
|
|
|
|
|
(let ((directory default-directory)
|
|
|
|
|
proc)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(setq default-directory directory)
|
1996-02-16 06:36:35 +00:00
|
|
|
(if (or (memq system-type '(emx ms-dos windows-nt windows-95))
|
|
|
|
|
synch)
|
|
|
|
|
;; In OS/2 (emx) do it synchronously, since OS/2 doesn't let us
|
1995-10-06 00:54:28 +00:00
|
|
|
;; delete files used by other processes. Thus, in ediff-buffers
|
|
|
|
|
;; and similar functions, we can't delete temp files because
|
1996-02-16 06:36:35 +00:00
|
|
|
;; they might be used by the asynch process that computes
|
1995-10-06 00:54:28 +00:00
|
|
|
;; custom diffs. So, we have to wait till custom diff
|
|
|
|
|
;; subprocess is done.
|
1996-02-16 06:36:35 +00:00
|
|
|
;; Similarly for Windows-*
|
|
|
|
|
;; In DOS, must synchronize because DOS doesn't have
|
|
|
|
|
;; asynchronous processes.
|
1995-10-06 00:54:28 +00:00
|
|
|
(apply 'call-process program nil buffer nil args)
|
|
|
|
|
;; On other systems, do it asynchronously.
|
|
|
|
|
(setq proc (get-buffer-process buffer))
|
|
|
|
|
(if proc (kill-process proc))
|
|
|
|
|
(setq proc
|
|
|
|
|
(apply 'start-process "Custom Diff" buffer program args))
|
|
|
|
|
(setq mode-line-process '(":%s"))
|
|
|
|
|
(set-process-sentinel proc 'ediff-process-sentinel)
|
|
|
|
|
(set-process-filter proc 'ediff-process-filter)
|
|
|
|
|
)))
|
1998-05-04 22:42:59 +00:00
|
|
|
(store-match-data data))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1999-06-22 22:46:17 +00:00
|
|
|
;; This is shell-command-filter from simple.el in Emacs.
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Copied here because XEmacs doesn't have it.
|
1995-10-06 00:54:28 +00:00
|
|
|
(defun ediff-process-filter (proc string)
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Do save-excursion by hand so that we can leave point numerically unchanged
|
|
|
|
|
;; despite an insertion immediately after it.
|
|
|
|
|
(let* ((obuf (current-buffer))
|
|
|
|
|
(buffer (process-buffer proc))
|
|
|
|
|
opoint
|
|
|
|
|
(window (get-buffer-window buffer))
|
|
|
|
|
(pos (window-start window)))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(or (= (point) (point-max))
|
|
|
|
|
(setq opoint (point)))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert-before-markers string))
|
|
|
|
|
;; insert-before-markers moved this marker: set it back.
|
|
|
|
|
(set-window-start window pos)
|
|
|
|
|
;; Finish our save-excursion.
|
|
|
|
|
(if opoint
|
|
|
|
|
(goto-char opoint))
|
|
|
|
|
(set-buffer obuf))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; like shell-command-sentinel but doesn't print an exit status message
|
|
|
|
|
;; we do this because diff always exits with status 1, if diffs are found
|
|
|
|
|
;; so shell-command-sentinel displays a confusing message to the user
|
1995-10-06 00:54:28 +00:00
|
|
|
(defun ediff-process-sentinel (process signal)
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (and (memq (process-status process) '(exit signal))
|
|
|
|
|
(buffer-name (process-buffer process)))
|
|
|
|
|
(progn
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (process-buffer process))
|
|
|
|
|
(setq mode-line-process nil))
|
|
|
|
|
(delete-process process))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +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
|
|
|
;;; Word functions used to refine the current diff
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(defvar ediff-forward-word-function 'ediff-forward-word
|
|
|
|
|
"*Function to call to move to the next word.
|
|
|
|
|
Used for splitting difference regions into individual words.")
|
2002-03-20 06:36:18 +00:00
|
|
|
(make-variable-buffer-local 'ediff-forward-word-function)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(defvar ediff-whitespace " \n\t\f"
|
|
|
|
|
"*Characters constituting white space.
|
|
|
|
|
These characters are ignored when differing regions are split into words.")
|
2002-03-20 06:36:18 +00:00
|
|
|
(make-variable-buffer-local 'ediff-whitespace)
|
1995-03-16 22:34:51 +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
|
|
|
(defvar ediff-word-1
|
|
|
|
|
(ediff-cond-compile-for-xemacs-or-emacs "a-zA-Z---_" "-[:word:]_")
|
1995-03-16 22:34:51 +00:00
|
|
|
"*Characters that constitute words of type 1.
|
|
|
|
|
More precisely, [ediff-word-1] is a regexp that matches type 1 words.
|
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
|
|
|
See `ediff-forward-word' for more details.")
|
2002-03-20 06:36:18 +00:00
|
|
|
(make-variable-buffer-local 'ediff-word-1)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(defvar ediff-word-2 "0-9.,"
|
|
|
|
|
"*Characters that constitute words of type 2.
|
|
|
|
|
More precisely, [ediff-word-2] is a regexp that matches type 2 words.
|
|
|
|
|
See `ediff-forward-word' for more details.")
|
2002-03-20 06:36:18 +00:00
|
|
|
(make-variable-buffer-local 'ediff-word-2)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(defvar ediff-word-3 "`'?!:;\"{}[]()"
|
|
|
|
|
"*Characters that constitute words of type 3.
|
|
|
|
|
More precisely, [ediff-word-3] is a regexp that matches type 3 words.
|
|
|
|
|
See `ediff-forward-word' for more details.")
|
2002-03-20 06:36:18 +00:00
|
|
|
(make-variable-buffer-local 'ediff-word-3)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(defvar ediff-word-4
|
|
|
|
|
(concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace)
|
|
|
|
|
"*Characters that constitute words of type 4.
|
|
|
|
|
More precisely, [ediff-word-4] is a regexp that matches type 4 words.
|
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
|
|
|
See `ediff-forward-word' for more details.")
|
2002-03-20 06:36:18 +00:00
|
|
|
(make-variable-buffer-local 'ediff-word-4)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; Split region along word boundaries. Each word will be on its own line.
|
|
|
|
|
;; Output to buffer out-buffer.
|
|
|
|
|
(defun ediff-forward-word ()
|
|
|
|
|
"Move point one word forward.
|
|
|
|
|
There are four types of words, each of which consists entirely of
|
|
|
|
|
characters in `ediff-word-1', `ediff-word-2', `ediff-word-3', or
|
2000-05-24 17:31:16 +00:00
|
|
|
`ediff-word-4'. Words are recognized by passing these one after another as
|
|
|
|
|
arguments to `skip-chars-forward'."
|
|
|
|
|
(or (> (+ (skip-chars-forward ediff-word-1)
|
|
|
|
|
(skip-syntax-forward "w"))
|
|
|
|
|
0)
|
1995-03-16 22:34:51 +00:00
|
|
|
(> (skip-chars-forward ediff-word-2) 0)
|
|
|
|
|
(> (skip-chars-forward ediff-word-3) 0)
|
|
|
|
|
(> (skip-chars-forward ediff-word-4) 0)
|
|
|
|
|
))
|
|
|
|
|
|
2000-07-06 05:36:21 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-wordify (beg end in-buffer out-buffer &optional control-buf)
|
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
|
|
|
(let ((forward-word-function
|
|
|
|
|
;; eval in control buf to let user create local versions for
|
|
|
|
|
;; different invocations
|
|
|
|
|
(if control-buf
|
|
|
|
|
(ediff-with-current-buffer control-buf
|
|
|
|
|
ediff-forward-word-function)
|
|
|
|
|
ediff-forward-word-function))
|
|
|
|
|
inbuf-syntax-tbl sv-point diff-string)
|
1995-03-16 22:34:51 +00:00
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer in-buffer)
|
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
* viper-util.el: Spaces, indentation.
* viper.el: Changed version, modification time.
2001-03-17 18:59:39 +00:00
|
|
|
(setq inbuf-syntax-tbl
|
|
|
|
|
(if control-buf
|
|
|
|
|
(ediff-with-current-buffer control-buf
|
|
|
|
|
ediff-syntax-table)
|
|
|
|
|
(syntax-table)))
|
|
|
|
|
(setq diff-string (buffer-substring-no-properties beg end))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(set-buffer out-buffer)
|
2002-07-03 12:01:24 +00:00
|
|
|
;; Make sure that temp buff syntax table is the same as the original buf
|
2000-07-06 05:36:21 +00:00
|
|
|
;; syntax tbl, because we use ediff-forward-word in both and
|
|
|
|
|
;; ediff-forward-word depends on the syntax classes of characters.
|
|
|
|
|
(set-syntax-table inbuf-syntax-tbl)
|
1995-03-16 22:34:51 +00:00
|
|
|
(erase-buffer)
|
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
* viper-util.el: Spaces, indentation.
* viper.el: Changed version, modification time.
2001-03-17 18:59:39 +00:00
|
|
|
(insert diff-string)
|
1995-03-16 22:34:51 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
(skip-chars-forward ediff-whitespace)
|
|
|
|
|
(delete-region (point-min) (point))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(while (not (eobp))
|
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
|
|
|
(funcall forward-word-function)
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq sv-point (point))
|
|
|
|
|
(skip-chars-forward ediff-whitespace)
|
|
|
|
|
(delete-region sv-point (point))
|
|
|
|
|
(insert "\n")))))
|
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
|
|
|
;; copy string specified as BEG END from IN-BUF to OUT-BUF
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-copy-to-buffer (beg end in-buffer out-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
|
|
|
(with-current-buffer out-buffer
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert-buffer-substring in-buffer beg end)
|
|
|
|
|
(goto-char (point-min))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
;; goto word #n starting at current position in buffer `buf'
|
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
* viper-util.el: Spaces, indentation.
* viper.el: Changed version, modification time.
2001-03-17 18:59:39 +00:00
|
|
|
;; For ediff, a word is determined by ediff-forward-word-function
|
1995-03-16 22:34:51 +00:00
|
|
|
;; If `flag' is non-nil, goto the end of the n-th word.
|
|
|
|
|
(defun ediff-goto-word (n buf &optional flag)
|
|
|
|
|
;; remember val ediff-forward-word-function has in ctl buf
|
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
* viper-util.el: Spaces, indentation.
* viper.el: Changed version, modification time.
2001-03-17 18:59:39 +00:00
|
|
|
(let ((fwd-word-fun ediff-forward-word-function)
|
|
|
|
|
(syntax-tbl ediff-syntax-table))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer buf
|
1995-03-16 22:34:51 +00:00
|
|
|
(skip-chars-forward ediff-whitespace)
|
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-with-syntax-table syntax-tbl
|
|
|
|
|
(while (> n 1)
|
|
|
|
|
(funcall fwd-word-fun)
|
|
|
|
|
(skip-chars-forward ediff-whitespace)
|
2005-02-19 04:46:24 +00:00
|
|
|
(setq n (1- n)))
|
|
|
|
|
(if (and flag (> n 0))
|
|
|
|
|
(funcall fwd-word-fun)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(point))))
|
|
|
|
|
|
1997-11-01 01:46:51 +00:00
|
|
|
(defun ediff-same-file-contents (f1 f2)
|
2005-02-19 04:46:24 +00:00
|
|
|
"Return t if files F1 and F2 have identical contents."
|
|
|
|
|
(if (and (not (file-directory-p f1))
|
|
|
|
|
(not (file-directory-p f2)))
|
|
|
|
|
(let ((res
|
|
|
|
|
(apply 'call-process ediff-cmp-program nil nil nil
|
|
|
|
|
(append ediff-cmp-options (list f1 f2)))))
|
|
|
|
|
(and (numberp res) (eq res 0))))
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun ediff-same-contents (d1 d2 &optional filter-re)
|
|
|
|
|
"Returns t iff D1 and D2 have the same content.
|
|
|
|
|
D1 and D2 can either be both directories or both regular files.
|
|
|
|
|
Symlinks and the likes are not handled.
|
|
|
|
|
If FILTER-RE is non-nil, recursive checking in directories
|
|
|
|
|
affects only files whose names match the expression."
|
|
|
|
|
;; Normalize empty filter RE to nil.
|
|
|
|
|
(unless (length filter-re) (setq filter-re nil))
|
|
|
|
|
;; Indicate progress
|
|
|
|
|
(message "Comparing '%s' and '%s' modulo '%s'" d1 d2 filter-re)
|
|
|
|
|
(cond
|
|
|
|
|
;; D1 & D2 directories => recurse
|
|
|
|
|
((and (file-directory-p d1)
|
|
|
|
|
(file-directory-p d2))
|
|
|
|
|
(if (null ediff-recurse-to-subdirectories)
|
|
|
|
|
(if (y-or-n-p "Compare subdirectories recursively? ")
|
|
|
|
|
(setq ediff-recurse-to-subdirectories 'yes)
|
|
|
|
|
(setq ediff-recurse-to-subdirectories 'no)))
|
|
|
|
|
(if (eq ediff-recurse-to-subdirectories 'yes)
|
|
|
|
|
(let* ((all-entries-1 (directory-files d1 t filter-re))
|
|
|
|
|
(all-entries-2 (directory-files d2 t filter-re))
|
|
|
|
|
(entries-1 (remove-if (lambda (s)
|
|
|
|
|
(string-match "^\\.\\.?$"
|
|
|
|
|
(file-name-nondirectory s)))
|
|
|
|
|
all-entries-1))
|
|
|
|
|
(entries-2 (remove-if (lambda (s)
|
|
|
|
|
(string-match "^\\.\\.?$"
|
|
|
|
|
(file-name-nondirectory s)))
|
|
|
|
|
all-entries-2))
|
|
|
|
|
)
|
|
|
|
|
;; First, check only the names (works quickly and ensures a
|
|
|
|
|
;; precondition for subsequent code)
|
|
|
|
|
(if (and (= (length entries-1) (length entries-2))
|
|
|
|
|
(every (lambda (a b) (equal (file-name-nondirectory a)
|
|
|
|
|
(file-name-nondirectory b)))
|
|
|
|
|
entries-1 entries-2))
|
|
|
|
|
;; With name equality established, compare the entries
|
|
|
|
|
;; through recursion.
|
|
|
|
|
(every (lambda (a b)
|
|
|
|
|
(ediff-same-contents a b filter-re))
|
|
|
|
|
entries-1 entries-2)
|
|
|
|
|
)
|
|
|
|
|
))
|
|
|
|
|
) ; end of the directories case
|
|
|
|
|
;; D1 & D2 are both files => compare directly
|
|
|
|
|
((and (file-regular-p d1)
|
|
|
|
|
(file-regular-p d2))
|
|
|
|
|
(ediff-same-file-contents d1 d2))
|
|
|
|
|
;; Otherwise => false: unequal contents
|
|
|
|
|
)
|
|
|
|
|
)
|
1997-11-01 01:46:51 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;;; Local Variables:
|
|
|
|
|
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
|
1997-07-31 04:04:23 +00:00
|
|
|
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
|
|
|
|
|
;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
|
1996-06-22 01:54:34 +00:00
|
|
|
;;; End:
|
|
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
;;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; ediff-diff.el ends here
|