mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity
89c52be24c
emacs/lisp/ediff-util.el

4290 lines
150 KiB
EmacsLisp
Raw Normal View History

Initial revision
1995-03-16 22:34:51 +00:00
;;; ediff-util.el --- the core commands and utilities of ediff
Update FSF's address.
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.
Initial revision
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>
Initial revision
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
Update FSF's address.
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.
Initial revision
1995-03-16 22:34:51 +00:00
Some fixes to follow coding conventions.
2001-07-16 07:46:48 +00:00
;;; Commentary:
Initial revision
1995-03-16 22:34:51 +00:00
;;; Code:
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-05-31 01:10:39 +00:00
(provide 'ediff-util)
Initial revision
1995-03-16 22:34:51 +00:00
new version
1997-05-31 01:10:39 +00:00
;; Compiler pacifier
(defvar ediff-patch-diagnostics)
(defvar ediff-patchbufer)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(defvar ediff-use-toolbar-p)
(defvar ediff-toolbar-height)
new version
1997-05-31 01:10:39 +00:00
(defvar ediff-toolbar)
(defvar ediff-toolbar-3way)
(defvar bottom-toolbar)
(defvar bottom-toolbar-visible-p)
(defvar bottom-toolbar-height)
(defvar mark-active)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(defvar ediff-emacs-p)
new version
1997-05-31 01:10:39 +00:00
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r comand. (viper-buffer-search-enable): Fixed format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name instead of viper-info-on-file. (ex-set-visited-file-name): New function. * viper.el (viper-emacs-state-mode-list): Added mail-mode. * ediff-mult.el (ediff-meta-mark-equal-files): Added optional action argument. * ediff-init.el: Fixed some doc strings. * ediff-util.el (ediff-after-quit-hook-internal): New variable. Got rid of make-local-hook. * ediff-wind.el (ediff-setup-control-frame): Got rid of make-local-hook.
2001-12-24 05:50:31 +00:00
(defvar ediff-after-quit-hook-internal nil)
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
(and noninteractive
(eval-when-compile
(load "reporter" 'noerror)))
new version
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-help)
(load "ediff-help.el" nil nil 'nosuffix))
(or (featurep 'ediff-mult)
(load "ediff-mult.el" nil nil 'nosuffix))
(or (featurep 'ediff-wind)
(load "ediff-wind.el" nil nil 'nosuffix))
(or (featurep 'ediff-diff)
(load "ediff-diff.el" nil nil 'nosuffix))
(or (featurep 'ediff-merg)
(load "ediff-merg.el" nil nil 'nosuffix))
(or (featurep 'ediff)
(load "ediff.el" nil nil 'nosuffix))
(or (featurep 'ediff-tbar)
new version
1998-05-04 22:42:59 +00:00
ediff-emacs-p
new version
1997-05-31 01:10:39 +00:00
(load "ediff-tbar.el" 'noerror nil 'nosuffix))
))
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; end pacifier
new version
1998-05-04 22:42:59 +00:00
*** empty log message ***
1996-12-28 02:53:04 +00:00
(require 'ediff-init)
(require 'ediff-help)
(require 'ediff-mult)
new version
1997-05-31 01:10:39 +00:00
(require 'ediff-wind)
(require 'ediff-diff)
(require 'ediff-merg)
*** empty log message ***
1996-12-28 02:53:04 +00:00
new version
1997-05-31 01:10:39 +00:00
(if ediff-xemacs-p
new version
1998-05-04 22:42:59 +00:00
(require 'ediff-tbar))
*** empty log message ***
1996-12-28 02:53:04 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;;; Functions
(defun ediff-mode ()
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
"Ediff mode controls all operations in a single Ediff session.
This mode is entered through one of the following commands:
Initial revision
1995-03-16 22:34:51 +00:00
`ediff'
`ediff-files'
`ediff-buffers'
*** empty log message ***
1996-06-22 01:54:34 +00:00
`ebuffers'
Initial revision
1995-03-16 22:34:51 +00:00
`ediff3'
`ediff-files3'
`ediff-buffers3'
*** empty log message ***
1996-06-22 01:54:34 +00:00
`ebuffers3'
Initial revision
1995-03-16 22:34:51 +00:00
`ediff-merge'
`ediff-merge-files'
`ediff-merge-files-with-ancestor'
`ediff-merge-buffers'
`ediff-merge-buffers-with-ancestor'
`ediff-merge-revisions'
`ediff-merge-revisions-with-ancestor'
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
`ediff-windows-wordwise'
`ediff-windows-linewise'
`ediff-regions-wordwise'
`ediff-regions-linewise'
Initial revision
1995-03-16 22:34:51 +00:00
`epatch'
`ediff-patch-file'
`ediff-patch-buffer'
`epatch-buffer'
new version
1997-07-17 19:37:07 +00:00
`erevision'
Initial revision
1995-03-16 22:34:51 +00:00
`ediff-revision'
Commands:
\\{ediff-mode-map}"
(kill-all-local-variables)
(setq major-mode 'ediff-mode)
(setq mode-name "Ediff")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-mode-hook))
Initial revision
1995-03-16 22:34:51 +00:00
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;;; Build keymaps
(ediff-defvar-local ediff-mode-map nil
"Local keymap used in Ediff mode.
This is local to each Ediff Control Panel, so they may vary from invocation
to invocation.")
;; Set up the keymap in the control buffer
(defun ediff-set-keys ()
"Set up Ediff keymap, if necessary."
(if (null ediff-mode-map)
(ediff-setup-keymap))
(use-local-map ediff-mode-map))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Reload Ediff keymap. For debugging only.
(defun ediff-reload-keymap ()
(interactive)
(setq ediff-mode-map nil)
(ediff-set-keys))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-setup-keymap ()
"Set up the keymap used in the control buffer of Ediff."
(setq ediff-mode-map (make-sparse-keymap))
(suppress-keymap ediff-mode-map)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-09-20 01:10:05 +00:00
(define-key ediff-mode-map
(if ediff-emacs-p [mouse-2] [button2]) 'ediff-help-for-quick-help)
(define-key ediff-mode-map "\C-m" 'ediff-help-for-quick-help)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "p" 'ediff-previous-difference)
(define-key ediff-mode-map "\C-?" 'ediff-previous-difference)
(define-key ediff-mode-map [delete] 'ediff-previous-difference)
(define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer
'ediff-previous-difference nil))
new version
1997-09-06 04:16:05 +00:00
;; must come after C-h, or else C-h wipes out backspace's binding in XEmacs
(define-key ediff-mode-map [backspace] 'ediff-previous-difference)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "n" 'ediff-next-difference)
(define-key ediff-mode-map " " 'ediff-next-difference)
(define-key ediff-mode-map "j" 'ediff-jump-to-difference)
(define-key ediff-mode-map "g" nil)
(define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point)
(define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point)
(define-key ediff-mode-map "q" 'ediff-quit)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(define-key ediff-mode-map "D" 'ediff-show-diff-output)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "z" 'ediff-suspend)
(define-key ediff-mode-map "\C-l" 'ediff-recenter)
(define-key ediff-mode-map "|" 'ediff-toggle-split)
(define-key ediff-mode-map "h" 'ediff-toggle-hilit)
(or ediff-word-mode
(define-key ediff-mode-map "@" 'ediff-toggle-autorefine))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if ediff-narrow-job
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "%" 'ediff-toggle-narrow-region))
(define-key ediff-mode-map "~" 'ediff-swap-buffers)
(define-key ediff-mode-map "v" 'ediff-scroll-vertically)
(define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically)
(define-key ediff-mode-map "^" 'ediff-scroll-vertically)
(define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically)
(define-key ediff-mode-map "V" 'ediff-scroll-vertically)
(define-key ediff-mode-map "<" 'ediff-scroll-horizontally)
(define-key ediff-mode-map ">" 'ediff-scroll-horizontally)
(define-key ediff-mode-map "i" 'ediff-status-info)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(define-key ediff-mode-map "E" 'ediff-documentation)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "?" 'ediff-toggle-help)
(define-key ediff-mode-map "!" 'ediff-update-diffs)
new version
1997-11-01 01:46:51 +00:00
(define-key ediff-mode-map "M" 'ediff-show-current-session-meta-buffer)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(define-key ediff-mode-map "R" 'ediff-show-registry)
Initial revision
1995-03-16 22:34:51 +00:00
(or ediff-word-mode
(define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs))
(define-key ediff-mode-map "a" nil)
(define-key ediff-mode-map "b" nil)
(define-key ediff-mode-map "r" nil)
(cond (ediff-merge-job
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; Will barf if no ancestor
(define-key ediff-mode-map "/" 'ediff-show-ancestor)
Initial revision
1995-03-16 22:34:51 +00:00
;; In merging, we allow only A->C and B->C copying.
*** empty log message ***
1996-02-16 06:36:35 +00:00
(define-key ediff-mode-map "a" 'ediff-copy-A-to-C)
(define-key ediff-mode-map "b" 'ediff-copy-B-to-C)
(define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "s" 'ediff-shrink-window-C)
(define-key ediff-mode-map "+" 'ediff-combine-diffs)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(define-key ediff-mode-map "$" nil)
(define-key ediff-mode-map "$$" 'ediff-toggle-show-clashes-only)
(define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "&" 'ediff-re-merge))
(ediff-3way-comparison-job
*** empty log message ***
1996-02-16 06:36:35 +00:00
(define-key ediff-mode-map "ab" 'ediff-copy-A-to-B)
(define-key ediff-mode-map "ba" 'ediff-copy-B-to-A)
(define-key ediff-mode-map "ac" 'ediff-copy-A-to-C)
(define-key ediff-mode-map "bc" 'ediff-copy-B-to-C)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "c" nil)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(define-key ediff-mode-map "ca" 'ediff-copy-C-to-A)
(define-key ediff-mode-map "cb" 'ediff-copy-C-to-B)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "ra" 'ediff-restore-diff)
(define-key ediff-mode-map "rb" 'ediff-restore-diff)
(define-key ediff-mode-map "rc" 'ediff-restore-diff)
(define-key ediff-mode-map "C" 'ediff-toggle-read-only))
(t ; 2-way comparison
*** empty log message ***
1996-02-16 06:36:35 +00:00
(define-key ediff-mode-map "a" 'ediff-copy-A-to-B)
(define-key ediff-mode-map "b" 'ediff-copy-B-to-A)
Initial revision
1995-03-16 22:34:51 +00:00
(define-key ediff-mode-map "ra" 'ediff-restore-diff)
(define-key ediff-mode-map "rb" 'ediff-restore-diff))
) ; cond
(define-key ediff-mode-map "G" 'ediff-submit-report)
(define-key ediff-mode-map "#" nil)
(define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match)
(define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match)
(or ediff-word-mode
(define-key ediff-mode-map "##" 'ediff-toggle-skip-similar))
(define-key ediff-mode-map "o" nil)
(define-key ediff-mode-map "A" 'ediff-toggle-read-only)
(define-key ediff-mode-map "B" 'ediff-toggle-read-only)
(define-key ediff-mode-map "w" nil)
(define-key ediff-mode-map "wa" 'ediff-save-buffer)
(define-key ediff-mode-map "wb" 'ediff-save-buffer)
(define-key ediff-mode-map "wd" 'ediff-save-buffer)
*** empty log message ***
1996-09-20 01:10:05 +00:00
(define-key ediff-mode-map "=" 'ediff-inferior-compare-regions)
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(if (and (fboundp 'ediff-show-patch-diagnostics) (ediff-patch-job))
*** empty log message ***
1996-06-22 01:54:34 +00:00
(define-key ediff-mode-map "P" 'ediff-show-patch-diagnostics))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-job
(progn
(define-key ediff-mode-map "wc" 'ediff-save-buffer)
(define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point)
))
(define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Allow ediff-mode-map to be referenced indirectly
(fset 'ediff-mode-map ediff-mode-map)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-keymap-setup-hook))
Initial revision
1995-03-16 22:34:51 +00:00
;;; Setup functions
new version
1997-05-31 01:10:39 +00:00
;; Common startup entry for all Ediff functions It now returns control buffer
;; so other functions can do post-processing SETUP-PARAMETERS is a list of the
;; form ((param .val) (param . val)...) This serves a similar purpose to
;; STARTUP-HOOKS, but these parameters are set in the new control buffer right
;; after this buf is created and before any windows are set and such.
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C
new version
1997-11-01 01:46:51 +00:00
startup-hooks setup-parameters
&optional merge-buffer-file)
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-preserve-cursor-color): new test that avoids rewrawing the screen when changing cursor color. (viper-insert-state-pre-command-sentinel, viper-replace-state-pre-command-sentinel, viper-replace-state-post-command-sentinel): use viper-preserve-cursor-color. Many functions changed to use viper= instead of = when comparing characters. * viper-util.el (viper-memq-char,viper=): new functions for working with characters. (viper-change-cursor-color): fixed buglet. Many functions changed to use viper= instead of = when comparing characters. * viper.el (viper-insert-state-mode-list): added eshell. * ediff-init.el (ediff-before-setup-hook): new hook. Several typos fixed in various docstrings. * ediff-merg.el (ediff-show-clashes-only): docstring typo fixed. * ediff-nult.el (ediff-before-session-group-setup-hooks): new hook. (ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks. * ediff-util.el (ediff-setup): run ediff-before-setup-hook. (ediff-other-buffer): use selected buffers if in Buffer-menu buffer. (ediff-get-selected-buffers): new function. * ediff-vers.el (ediff-vc-internal,ediff-rcs-internal, ediff-vc-merge-internal,ediff-rcs-merge-internal): use save-window-excursion. * ediff-wind.el (ediff-skip-unsuitable-frames): more robust termination check in while loop. * ediff.el (ediff-get-default-file-name): better defaults when in dired buffer. (ediff-files,ediff-merge-files,ediff-files3, ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
2000-10-29 04:56:45 +00:00
(run-hooks 'ediff-before-setup-hook)
*** empty log message ***
1996-09-20 01:10:05 +00:00
;; ediff-convert-standard-filename puts file names in the form appropriate
;; for the OS at hand.
(setq file-A (ediff-convert-standard-filename (expand-file-name file-A)))
(setq file-B (ediff-convert-standard-filename (expand-file-name file-B)))
Initial revision
1995-03-16 22:34:51 +00:00
(if (stringp file-C)
*** empty log message ***
1996-09-20 01:10:05 +00:00
(setq file-C
(ediff-convert-standard-filename (expand-file-name file-C))))
new version
1997-11-01 01:46:51 +00:00
(if (stringp merge-buffer-file)
(progn
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq merge-buffer-file
new version
1997-11-01 01:46:51 +00:00
(ediff-convert-standard-filename
(expand-file-name merge-buffer-file)))
;; check the directory exists
(or (file-exists-p (file-name-directory merge-buffer-file))
Some fixes to follow coding conventions.
2001-07-16 07:46:48 +00:00
(error "Directory %s given as place to save the merge doesn't exist"
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(abbreviate-file-name
new version
1997-11-01 01:46:51 +00:00
(file-name-directory merge-buffer-file))))
(if (and (file-exists-p merge-buffer-file)
(file-directory-p merge-buffer-file))
(error "The merge buffer file %s must not be a directory"
(abbreviate-file-name merge-buffer-file)))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(let* ((control-buffer-name
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-unique-buffer-name "*Ediff Control Panel" "*"))
new version
1997-07-31 04:04:23 +00:00
(control-buffer (ediff-with-current-buffer buffer-A
Initial revision
1995-03-16 22:34:51 +00:00
(get-buffer-create control-buffer-name))))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer control-buffer
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-mode)
new version
1997-05-31 01:10:39 +00:00
(make-local-variable 'ediff-use-long-help-message)
(make-local-variable 'ediff-prefer-iconified-control-frame)
(make-local-variable 'ediff-split-window-function)
(make-local-variable 'ediff-default-variant)
(make-local-variable 'ediff-merge-window-share)
(make-local-variable 'ediff-window-setup-function)
(make-local-variable 'ediff-keep-variants)
*** empty log message ***
1999-11-01 07:16:15 +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
(ediff-cond-compile-for-xemacs-or-emacs
(make-local-hook 'ediff-after-quit-hook-internal) ; xemacs form
nil ; emacs form
)
Initial revision
1995-03-16 22:34:51 +00:00
;; unwrap set up parameters passed as argument
(while setup-parameters
(set (car (car setup-parameters)) (cdr (car setup-parameters)))
(setq setup-parameters (cdr setup-parameters)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; set variables classifying the current ediff job
new version
1997-05-31 01:10:39 +00:00
;; must come AFTER setup-parameters
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-3way-comparison-job (ediff-3way-comparison-job)
ediff-merge-job (ediff-merge-job)
ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job)
ediff-3way-job (ediff-3way-job)
ediff-diff3-job (ediff-diff3-job)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
ediff-narrow-job (ediff-narrow-job)
ediff-windows-job (ediff-windows-job)
Initial revision
1995-03-16 22:34:51 +00:00
ediff-word-mode-job (ediff-word-mode-job))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; Don't delete variants in case of ediff-buffer-* jobs without asking.
;; This is because u may loose work---dangerous.
(if (string-match "buffer" (symbol-name ediff-job-name))
(setq ediff-keep-variants t))
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-cond-compile-for-xemacs-or-emacs
(make-local-hook 'pre-command-hook) ; xemacs form
nil ; emacs form
)
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r comand. (viper-buffer-search-enable): Fixed format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name instead of viper-info-on-file. (ex-set-visited-file-name): New function. * viper.el (viper-emacs-state-mode-list): Added mail-mode. * ediff-mult.el (ediff-meta-mark-equal-files): Added optional action argument. * ediff-init.el: Fixed some doc strings. * ediff-util.el (ediff-after-quit-hook-internal): New variable. Got rid of make-local-hook. * ediff-wind.el (ediff-setup-control-frame): Got rid of make-local-hook.
2001-12-24 05:50:31 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if (ediff-window-display-p)
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r comand. (viper-buffer-search-enable): Fixed format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name instead of viper-info-on-file. (ex-set-visited-file-name): New function. * viper.el (viper-emacs-state-mode-list): Added mail-mode. * ediff-mult.el (ediff-meta-mark-equal-files): Added optional action argument. * ediff-init.el: Fixed some doc strings. * ediff-util.el (ediff-after-quit-hook-internal): New variable. Got rid of make-local-hook. * ediff-wind.el (ediff-setup-control-frame): Got rid of make-local-hook.
2001-12-24 05:50:31 +00:00
(add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq ediff-mouse-pixel-position (mouse-pixel-position))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; adjust for merge jobs
(if ediff-merge-job
(let ((buf
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; If default variant is `combined', the right stuff is
Initial revision
1995-03-16 22:34:51 +00:00
;; inserted by ediff-do-merge
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; Note: at some point, we tried to put ancestor buffer here
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; (which is currently buffer C. This didn't work right
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; because the merge buffer will contain lossage: diff regions
;; in the ancestor, which correspond to revisions that agree
;; in both buf A and B.
(cond ((eq ediff-default-variant 'default-B)
buffer-B)
(t buffer-A))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-split-window-function
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
ediff-merge-split-window-function)
Initial revision
1995-03-16 22:34:51 +00:00
;; remember the ancestor buffer, if any
(setq ediff-ancestor-buffer buffer-C)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq buffer-C
(get-buffer-create
(ediff-unique-buffer-name "*ediff-merge" "*")))
(save-excursion
(set-buffer buffer-C)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(insert-buffer buf)
new version
1997-07-31 04:04:23 +00:00
(funcall (ediff-with-current-buffer buf major-mode))
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
(widen) ; merge buffer is always widened
*** empty log message ***
1996-06-22 01:54:34 +00:00
(add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq buffer-read-only nil
Initial revision
1995-03-16 22:34:51 +00:00
ediff-buffer-A buffer-A
ediff-buffer-B buffer-B
ediff-buffer-C buffer-C
ediff-control-buffer control-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
(ediff-choose-syntax-table)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-control-buffer-suffix
(if (string-match "<[0-9]*>" control-buffer-name)
(substring control-buffer-name
(match-beginning 0) (match-end 0))
"")
ediff-control-buffer-number
(max
0
(1-
(string-to-number
(substring
ediff-control-buffer-suffix
(or
(string-match "[0-9]+" ediff-control-buffer-suffix)
0))))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq ediff-error-buffer
(get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
(ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-job
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer-C (ediff-strip-mode-line-format)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (ediff-buffer-live-p ediff-ancestor-buffer)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-ancestor-buffer
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-strip-mode-line-format)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-save-protected-variables) ; save variables to be restored on exit
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; ediff-setup-diff-regions-function must be set after setup
;; parameters are processed.
(setq ediff-setup-diff-regions-function
(if ediff-diff3-job
'ediff-setup-diff-regions3
'ediff-setup-diff-regions))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-wide-bounds
(list (ediff-make-bullet-proof-overlay
'(point-min) '(point-max) ediff-buffer-A)
(ediff-make-bullet-proof-overlay
'(point-min) '(point-max) ediff-buffer-B)
(ediff-make-bullet-proof-overlay
'(point-min) '(point-max) ediff-buffer-C)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; This has effect only on ediff-windows/regions
;; In all other cases, ediff-visible-region sets visibility bounds to
;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
(if ediff-start-narrowed
(setq ediff-visible-bounds ediff-narrow-bounds)
(setq ediff-visible-bounds ediff-wide-bounds))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-set-keys) ; comes after parameter setup
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; set up ediff-narrow-bounds, if not set
(or ediff-narrow-bounds
(setq ediff-narrow-bounds ediff-wide-bounds))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
;; All these must be inside ediff-with-current-buffer control-buffer,
Initial revision
1995-03-16 22:34:51 +00:00
;; since these vars are local to control-buffer
;; These won't run if there are errors in diff
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-A
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-nuke-selective-display)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-prepare-buffer-hook)
new version
1997-07-31 04:04:23 +00:00
(if (ediff-with-current-buffer control-buffer ediff-merge-job)
Initial revision
1995-03-16 22:34:51 +00:00
(setq buffer-read-only t))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; add control-buffer to the list of sessions--no longer used, but may
;; be used again in the future
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(or (memq control-buffer ediff-this-buffer-ediff-sessions)
(setq ediff-this-buffer-ediff-sessions
(cons control-buffer ediff-this-buffer-ediff-sessions)))
new version
1997-07-17 19:37:07 +00:00
(if ediff-make-buffers-readonly-at-startup
(setq buffer-read-only t))
Initial revision
1995-03-16 22:34:51 +00:00
)
new version
1997-07-17 19:37:07 +00:00
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-B
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-nuke-selective-display)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-prepare-buffer-hook)
new version
1997-07-31 04:04:23 +00:00
(if (ediff-with-current-buffer control-buffer ediff-merge-job)
Initial revision
1995-03-16 22:34:51 +00:00
(setq buffer-read-only t))
;; add control-buffer to the list of sessions
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(or (memq control-buffer ediff-this-buffer-ediff-sessions)
(setq ediff-this-buffer-ediff-sessions
(cons control-buffer ediff-this-buffer-ediff-sessions)))
new version
1997-07-17 19:37:07 +00:00
(if ediff-make-buffers-readonly-at-startup
(setq buffer-read-only t))
Initial revision
1995-03-16 22:34:51 +00:00
)
new version
1997-07-17 19:37:07 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-job
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-nuke-selective-display)
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 merge bufer should never be narrowed
;; (it can happen if it is on rmail-mode or similar)
(if (ediff-with-current-buffer control-buffer ediff-merge-job)
(widen))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-prepare-buffer-hook)
Initial revision
1995-03-16 22:34:51 +00:00
;; add control-buffer to the list of sessions
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(or (memq control-buffer ediff-this-buffer-ediff-sessions)
(setq ediff-this-buffer-ediff-sessions
Initial revision
1995-03-16 22:34:51 +00:00
(cons control-buffer
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
ediff-this-buffer-ediff-sessions)))
new version
1997-07-17 19:37:07 +00:00
(if ediff-make-buffers-readonly-at-startup
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 buffer-read-only t)
(setq buffer-read-only nil))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
))
(if (ediff-buffer-live-p ediff-ancestor-buffer)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-ancestor-buffer
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-nuke-selective-display)
(setq buffer-read-only t)
(run-hooks 'ediff-prepare-buffer-hook)
(or (memq control-buffer ediff-this-buffer-ediff-sessions)
(setq ediff-this-buffer-ediff-sessions
(cons control-buffer
ediff-this-buffer-ediff-sessions)))
Initial revision
1995-03-16 22:34:51 +00:00
))
Trailing whitespace deleted.
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
;; the following must be after setting up ediff-narrow-bounds AND after
Initial revision
1995-03-16 22:34:51 +00:00
;; nuking selective display
(funcall ediff-setup-diff-regions-function file-A file-B file-C)
(setq ediff-number-of-differences (length ediff-difference-vector-A))
(setq ediff-current-difference -1)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-make-current-diff-overlay 'A)
(ediff-make-current-diff-overlay 'B)
(if ediff-3way-job
(ediff-make-current-diff-overlay 'C))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if ediff-merge-with-ancestor-job
(ediff-make-current-diff-overlay 'Ancestor))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(let ((shift-A (ediff-overlay-start
(ediff-get-value-according-to-buffer-type
'A ediff-narrow-bounds)))
(shift-B (ediff-overlay-start
(ediff-get-value-according-to-buffer-type
'B ediff-narrow-bounds)))
(shift-C (ediff-overlay-start
(ediff-get-value-according-to-buffer-type
'C ediff-narrow-bounds))))
;; position point in buf A
(save-excursion
(select-window ediff-window-A)
(goto-char shift-A))
;; position point in buf B
(save-excursion
(select-window ediff-window-B)
(goto-char shift-B))
(if ediff-3way-job
(save-excursion
(select-window ediff-window-C)
(goto-char shift-C)))
)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(select-window ediff-control-window)
(ediff-visible-region)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'startup-hooks)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(ediff-arrange-autosave-in-merge-jobs merge-buffer-file)
new version
1997-11-01 01:46:51 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-refresh-mode-lines)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq buffer-read-only t)
(setq ediff-session-registry
(cons control-buffer ediff-session-registry))
(ediff-update-registry)
(if (ediff-buffer-live-p ediff-meta-buffer)
new version
1997-11-01 01:46:51 +00:00
(ediff-update-meta-buffer
ediff-meta-buffer nil ediff-meta-session-number))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-startup-hook)
) ; eval in control-buffer
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
control-buffer))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; This function assumes that we are in the window where control buffer is
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; to reside.
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-setup-control-buffer (ctl-buf)
"Set up window for control buffer."
(if (window-dedicated-p (selected-window))
(set-buffer ctl-buf) ; we are in control frame but just in case
(switch-to-buffer ctl-buf))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((window-min-height 2))
Initial revision
1995-03-16 22:34:51 +00:00
(erase-buffer)
(ediff-set-help-message)
(insert ediff-help-message)
(shrink-window-if-larger-than-buffer)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(or (ediff-multiframe-setup-p)
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-indent-help-message))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(ediff-set-help-overlays)
Initial revision
1995-03-16 22:34:51 +00:00
(set-buffer-modified-p nil)
(ediff-refresh-mode-lines)
(setq ediff-control-window (selected-window))
(setq ediff-window-config-saved
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(format "%S%S%S%S%S%S%S"
Initial revision
1995-03-16 22:34:51 +00:00
ediff-control-window
ediff-window-A
ediff-window-B
ediff-window-C
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
ediff-split-window-function
(ediff-multiframe-setup-p)
ediff-wide-display-p))
new version
1997-05-31 01:10:39 +00:00
;; In multiframe, toolbar is set in ediff-setup-control-frame
*** empty log message ***
1996-12-28 02:53:04 +00:00
(if (not (ediff-multiframe-setup-p))
new version
1997-05-31 01:10:39 +00:00
(ediff-make-bottom-toolbar)) ; this checks if toolbar is requested
Initial revision
1995-03-16 22:34:51 +00:00
(goto-char (point-min))
(skip-chars-forward ediff-whitespace)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-11-01 01:46:51 +00:00
;; This executes in control buffer and sets auto-save, visited file name, etc,
;; in the merge buffer
*** empty log message ***
1999-11-01 07:16:15 +00:00
(defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file)
new version
1997-11-01 01:46:51 +00:00
(if (not ediff-merge-job)
()
(if (stringp merge-buffer-file)
(setq ediff-autostore-merges t
ediff-merge-store-file merge-buffer-file))
(if (stringp ediff-merge-store-file)
(progn
;; save before leaving ctl buffer
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-verify-file-merge-buffer ediff-merge-store-file)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq merge-buffer-file ediff-merge-store-file)
new version
1997-11-01 01:46:51 +00:00
(ediff-with-current-buffer ediff-buffer-C
(set-visited-file-name merge-buffer-file))))
(ediff-with-current-buffer ediff-buffer-C
(setq buffer-offer-save t) ; ask before killing buffer
;; make sure the contents is auto-saved
(auto-save-mode 1))
))
Initial revision
1995-03-16 22:34:51 +00:00
;;; Commands for working with Ediff
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-update-diffs ()
"Recompute difference regions in buffers A, B, and C.
Buffers are not synchronized with their respective files, so changes done
to these buffers are not saved at this point---the user can do this later,
if necessary."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
(if (and (ediff-buffer-live-p ediff-ancestor-buffer)
new version
1997-07-31 04:04:23 +00:00
(not
(y-or-n-p
*** empty log message ***
1999-11-01 07:16:15 +00:00
"Ancestor buffer will not be used. Recompute diffs anyway? ")))
new version
1997-07-31 04:04:23 +00:00
(error "Recomputation of differences canceled"))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(let ((point-A (ediff-with-current-buffer ediff-buffer-A (point)))
;;(point-B (ediff-with-current-buffer ediff-buffer-B (point)))
Initial revision
1995-03-16 22:34:51 +00:00
(tmp-buffer (get-buffer-create ediff-tmp-buffer))
new version
1997-07-31 04:04:23 +00:00
(buf-A-file-name (buffer-file-name ediff-buffer-A))
(buf-B-file-name (buffer-file-name ediff-buffer-B))
;; (null ediff-buffer-C) is no problem, as we later check if
;; ediff-buffer-C is alive
(buf-C-file-name (buffer-file-name ediff-buffer-C))
Initial revision
1995-03-16 22:34:51 +00:00
(overl-A (ediff-get-value-according-to-buffer-type
'A ediff-narrow-bounds))
(overl-B (ediff-get-value-according-to-buffer-type
'B ediff-narrow-bounds))
(overl-C (ediff-get-value-according-to-buffer-type
'C ediff-narrow-bounds))
beg-A end-A beg-B end-B beg-C end-C
file-A file-B file-C)
new version
1997-07-31 04:04:23 +00:00
(if (stringp buf-A-file-name)
(setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
(if (stringp buf-B-file-name)
(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
(if (stringp buf-C-file-name)
(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-unselect-and-select-difference -1)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq beg-A (ediff-overlay-start overl-A)
beg-B (ediff-overlay-start overl-B)
beg-C (ediff-overlay-start overl-C)
end-A (ediff-overlay-end overl-A)
end-B (ediff-overlay-end overl-B)
end-C (ediff-overlay-end overl-C))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-word-mode
(progn
(ediff-wordify beg-A end-A ediff-buffer-A tmp-buffer)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq file-A (ediff-make-temp-file tmp-buffer "regA"))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-wordify beg-B end-B ediff-buffer-B tmp-buffer)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq file-B (ediff-make-temp-file tmp-buffer "regB"))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-job
(progn
(ediff-wordify beg-C end-C ediff-buffer-C tmp-buffer)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq file-C (ediff-make-temp-file tmp-buffer "regC"))))
Initial revision
1995-03-16 22:34:51 +00:00
)
;; not word-mode
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name))
(setq file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-job
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name)))
Initial revision
1995-03-16 22:34:51 +00:00
)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
(ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
(ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-clear-diff-vector
'ediff-difference-vector-Ancestor 'fine-diffs-also)
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; let them garbage collect. we can't use the ancestor after recomputing
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; the diffs.
(setq ediff-difference-vector-Ancestor nil
ediff-ancestor-buffer nil
ediff-state-of-merge nil)
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; In case of merge job, fool it into thinking that it is just doing
Initial revision
1995-03-16 22:34:51 +00:00
;; comparison
(let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-3way-comparison-job ediff-3way-comparison-job)
(ediff-merge-job ediff-merge-job)
(ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job)
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-job-name ediff-job-name))
(if ediff-merge-job
(setq ediff-setup-diff-regions-function 'ediff-setup-diff-regions3
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
ediff-3way-comparison-job t
ediff-merge-job nil
ediff-merge-with-ancestor-job nil
Initial revision
1995-03-16 22:34:51 +00:00
ediff-job-name 'ediff-files3))
(funcall ediff-setup-diff-regions-function file-A file-B file-C))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-number-of-differences (length ediff-difference-vector-A))
(delete-file file-A)
(delete-file file-B)
(if file-C
(delete-file file-C))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-job
(ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
(message "")
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; Not bound to any key---to dangerous. A user can do it if necessary.
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
*** empty log message ***
1999-11-01 07:16:15 +00:00
"Revert buffers A, B and C. Then rerun Ediff on file A and file B."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(let ((bufA ediff-buffer-A)
(bufB ediff-buffer-B)
(bufC ediff-buffer-C)
(ctl-buf ediff-control-buffer)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(keep-variants ediff-keep-variants)
Initial revision
1995-03-16 22:34:51 +00:00
(ancestor-buf ediff-ancestor-buffer)
(ancestor-job ediff-merge-with-ancestor-job)
(merge ediff-merge-job)
(comparison ediff-3way-comparison-job))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer bufA
Initial revision
1995-03-16 22:34:51 +00:00
(revert-buffer t noconfirm))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer bufB
Initial revision
1995-03-16 22:34:51 +00:00
(revert-buffer t noconfirm))
;; this should only be executed in a 3way comparison, not in merge
(if comparison
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer bufC
Initial revision
1995-03-16 22:34:51 +00:00
(revert-buffer t noconfirm)))
(if merge
(progn
(set-buffer ctl-buf)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; the argument says whether to reverse the meaning of
;; ediff-keep-variants, i.e., ediff-really-quit runs here with
;; variants kept.
(ediff-really-quit (not keep-variants))
Initial revision
1995-03-16 22:34:51 +00:00
(kill-buffer bufC)
(if ancestor-job
(ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf)
(ediff-merge-buffers bufA bufB)))
(ediff-update-diffs))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; optional NO-REHIGHLIGHT says to not rehighlight buffers
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-recenter (&optional no-rehighlight)
"Bring the highlighted region of all buffers being compared into view.
Reestablish the default three-window display."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(let (buffer-read-only)
(if (and (ediff-buffer-live-p ediff-buffer-A)
(ediff-buffer-live-p ediff-buffer-B)
(or (not ediff-3way-job)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-buffer-live-p ediff-buffer-C)))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-setup-windows
ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer)
(or (eq this-command 'ediff-quit)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(message ediff-KILLED-VITAL-BUFFER
(beep 1)))
Initial revision
1995-03-16 22:34:51 +00:00
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; set visibility range appropriate to this invocation of Ediff.
(ediff-visible-region)
;; raise
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if (and (ediff-window-display-p)
Initial revision
1995-03-16 22:34:51 +00:00
(symbolp this-command)
(symbolp last-command)
;; Either one of the display-changing commands
(or (memq this-command
'(ediff-recenter
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
ediff-dir-action ediff-registry-action
ediff-patch-action
Initial revision
1995-03-16 22:34:51 +00:00
ediff-toggle-wide-display ediff-toggle-multiframe))
;; Or one of the movement cmds and prev cmd was an Ediff cmd
Comment fixes.
1996-01-05 22:21:28 +00:00
;; This avoids raising frames unnecessarily.
Initial revision
1995-03-16 22:34:51 +00:00
(and (memq this-command
'(ediff-next-difference
ediff-previous-difference
ediff-jump-to-difference
ediff-jump-to-difference-at-point))
(not (string-match "^ediff-" (symbol-name last-command)))
)))
(progn
(if (window-live-p ediff-window-A)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(raise-frame (window-frame ediff-window-A)))
Initial revision
1995-03-16 22:34:51 +00:00
(if (window-live-p ediff-window-B)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(raise-frame (window-frame ediff-window-B)))
Initial revision
1995-03-16 22:34:51 +00:00
(if (window-live-p ediff-window-C)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(raise-frame (window-frame ediff-window-C)))))
(if (and (ediff-window-display-p)
(frame-live-p ediff-control-frame)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(not ediff-use-long-help-message)
Initial revision
1995-03-16 22:34:51 +00:00
(not (ediff-frame-iconified-p ediff-control-frame)))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(raise-frame ediff-control-frame))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Redisplay whatever buffers are showing, if there is a selected difference
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(let ((control-frame ediff-control-frame)
(control-buf ediff-control-buffer))
Initial revision
1995-03-16 22:34:51 +00:00
(if (and (ediff-buffer-live-p ediff-buffer-A)
(ediff-buffer-live-p ediff-buffer-B)
(or (not ediff-3way-job)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(ediff-buffer-live-p ediff-buffer-C)))
Initial revision
1995-03-16 22:34:51 +00:00
(progn
(or no-rehighlight
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-select-difference ediff-current-difference))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-recenter-one-window 'A)
(ediff-recenter-one-window 'B)
(if ediff-3way-job
(ediff-recenter-one-window 'C))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer control-buf
*** empty log message ***
1996-02-16 06:36:35 +00:00
(ediff-recenter-ancestor) ; check if ancestor is alive
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (and (ediff-multiframe-setup-p)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(not ediff-use-long-help-message)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(not (ediff-frame-iconified-p ediff-control-frame)))
;; never grab mouse on quit in this place
(ediff-reset-mouse
control-frame
(eq this-command 'ediff-quit))))
Initial revision
1995-03-16 22:34:51 +00:00
))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(ediff-restore-highlighting)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
Initial revision
1995-03-16 22:34:51 +00:00
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; this function returns to the window it was called from
;; (which was the control window)
(defun ediff-recenter-one-window (buf-type)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (ediff-valid-difference-p)
;; context must be saved before switching to windows A/B/C
(let* ((ctl-wind (selected-window))
(shift (ediff-overlay-start
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-get-value-according-to-buffer-type
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
buf-type ediff-narrow-bounds)))
(job-name ediff-job-name)
(control-buf ediff-control-buffer)
new version
1997-07-31 04:04:23 +00:00
(window-name (ediff-get-symbol-from-alist
buf-type ediff-window-alist))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(window (if (window-live-p (symbol-value window-name))
(symbol-value window-name))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (and window ediff-windows-job)
(set-window-start window shift))
(if window
(progn
(select-window window)
(ediff-deactivate-mark)
(ediff-position-region
(ediff-get-diff-posn buf-type 'beg nil control-buf)
(ediff-get-diff-posn buf-type 'end nil control-buf)
(ediff-get-diff-posn buf-type 'beg nil control-buf)
job-name
)))
(select-window ctl-wind)
)))
(defun ediff-recenter-ancestor ()
;; do half-hearted job by recentering the ancestor buffer, if it is alive and
;; visible.
(if (and (ediff-buffer-live-p ediff-ancestor-buffer)
(ediff-valid-difference-p))
(let ((window (ediff-get-visible-buffer-window ediff-ancestor-buffer))
(ctl-wind (selected-window))
(job-name ediff-job-name)
(ctl-buf ediff-control-buffer))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-ancestor-buffer
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(goto-char (ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf))
(if window
(progn
(select-window window)
(ediff-position-region
(ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf)
(ediff-get-diff-posn 'Ancestor 'end nil ctl-buf)
(ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf)
job-name))))
(select-window ctl-wind)
)))
Initial revision
1995-03-16 22:34:51 +00:00
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; This will have to be refined for 3way jobs
(defun ediff-toggle-split ()
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
"Toggle vertical/horizontal window split.
Initial revision
1995-03-16 22:34:51 +00:00
Does nothing if file-A and file-B are in different frames."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A))
(wind-B (if (window-live-p ediff-window-B) ediff-window-B))
(wind-C (if (window-live-p ediff-window-C) ediff-window-C))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(frame-A (if wind-A (window-frame wind-A)))
(frame-B (if wind-B (window-frame wind-B)))
(frame-C (if wind-C (window-frame wind-C))))
Initial revision
1995-03-16 22:34:51 +00:00
(if (or (eq frame-A frame-B)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(not (frame-live-p frame-A))
(not (frame-live-p frame-B))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-comparison-job
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(or (not (frame-live-p frame-C))
Initial revision
1995-03-16 22:34:51 +00:00
(eq frame-A frame-C) (eq frame-B frame-C))))
(setq ediff-split-window-function
(if (eq ediff-split-window-function 'split-window-vertically)
'split-window-horizontally
'split-window-vertically))
(message "Buffers being compared are in different frames"))
(ediff-recenter 'no-rehighlight)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-toggle-hilit ()
"Switch between highlighting using ASCII flags and highlighting using faces.
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
On a dumb terminal, switches between ASCII highlighting and no highlighting."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(ediff-unselect-and-select-difference
ediff-current-difference 'unselect-only)
;; cycle through highlighting
(cond ((and ediff-use-faces
(ediff-has-face-support-p)
ediff-highlight-all-diffs)
(message "Unhighlighting unselected difference regions")
(setq ediff-highlight-all-diffs nil
ediff-highlighting-style 'face))
((or (and ediff-use-faces (ediff-has-face-support-p)
(eq ediff-highlighting-style 'face)) ; has face support
(and (not (ediff-has-face-support-p)) ; no face support
(eq ediff-highlighting-style 'off)))
(message "Highlighting with ASCII flags")
(setq ediff-highlighting-style 'ascii
ediff-highlight-all-diffs nil
ediff-use-faces nil))
((eq ediff-highlighting-style 'ascii)
(message "ASCII highlighting flags removed")
(setq ediff-highlighting-style 'off
ediff-highlight-all-diffs nil))
((ediff-has-face-support-p) ; catch-all for cases with face support
(message "Re-highlighting all difference regions")
(setq ediff-use-faces t
ediff-highlighting-style 'face
ediff-highlight-all-diffs t)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(if (and ediff-use-faces ediff-highlight-all-diffs)
(ediff-paint-background-regions)
(ediff-paint-background-regions 'unhighlight))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(ediff-unselect-and-select-difference
ediff-current-difference 'select-only))
*** empty log message ***
1996-09-20 01:10:05 +00:00
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-toggle-autorefine ()
"Toggle auto-refine mode."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-word-mode
(error "No fine differences in this mode"))
(cond ((eq ediff-auto-refine 'nix)
(setq ediff-auto-refine 'on)
(ediff-make-fine-diffs ediff-current-difference 'noforce)
(message "Auto-refining is ON"))
((eq ediff-auto-refine 'on)
(message "Auto-refining is OFF")
(setq ediff-auto-refine 'off))
(t ;; nix 'em
(ediff-set-fine-diff-properties ediff-current-difference 'default)
(message "Refinements are HIDDEN")
(setq ediff-auto-refine 'nix))
))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-show-ancestor ()
"Show the ancestor buffer in a suitable window."
(interactive)
(ediff-recenter)
(or (ediff-buffer-live-p ediff-ancestor-buffer)
(if ediff-merge-with-ancestor-job
(error "Lost connection to ancestor buffer...sorry")
(error "Not merging with ancestor")))
(let (wind)
(cond ((setq wind (ediff-get-visible-buffer-window ediff-ancestor-buffer))
(raise-frame (window-frame wind)))
(t (set-window-buffer ediff-window-C ediff-ancestor-buffer)))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-make-or-kill-fine-diffs (arg)
*** empty log message ***
1999-11-01 07:16:15 +00:00
"Compute fine diffs. With negative prefix arg, kill fine diffs.
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
In both cases, operates on the current difference region."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(cond ((eq arg '-)
(ediff-clear-fine-differences ediff-current-difference))
((and (numberp arg) (< arg 0))
(ediff-clear-fine-differences ediff-current-difference))
(t (ediff-make-fine-diffs))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-toggle-help ()
"Toggle short/long help message."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(let (buffer-read-only)
(erase-buffer)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(setq ediff-use-long-help-message (not ediff-use-long-help-message))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-set-help-message))
;; remember the icon status of the control frame when the user requested
;; full control message
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if (and ediff-use-long-help-message (ediff-multiframe-setup-p))
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-prefer-iconified-control-frame
(ediff-frame-iconified-p ediff-control-frame)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-window-config-saved "") ; force redisplay
(ediff-recenter 'no-rehighlight))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; If BUF, this is the buffer to toggle, not current buffer.
(defun ediff-toggle-read-only (&optional buf)
"Toggle read-only in current buffer.
If buffer is under version control and locked, check it out first.
If optional argument BUF is specified, toggle read-only in that buffer instead
of the current buffer."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(let ((ctl-buf (if (null buf) (current-buffer)))
(buf-type (ediff-char-to-buftype last-command-char)))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(or buf (ediff-recenter))
(or buf
*** empty log message ***
1996-02-16 06:36:35 +00:00
(setq buf (ediff-get-buffer buf-type)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buf ; eval in buf A/B/C
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let* ((file (buffer-file-name buf))
(file-writable (and file
(file-exists-p file)
(file-writable-p file)))
(toggle-ro-cmd (cond (ediff-toggle-read-only-function)
((ediff-file-checked-out-p file)
'toggle-read-only)
(file-writable 'toggle-read-only)
(t (key-binding "\C-x\C-q")))))
;; If the file is checked in, make sure we don't make buffer modifiable
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; without warning the user. The user can fool our checks by making the
;; buffer non-RO without checking the file out. We regard this as a
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; user problem.
(if (and (ediff-file-checked-in-p file)
;; If ctl-buf is null, this means we called this
;; non-interactively, in which case don't ask questions
ctl-buf)
(cond ((not buffer-read-only)
(setq toggle-ro-cmd 'toggle-read-only))
((and (or (beep 1) t) ; always beep
(y-or-n-p
(format
*** empty log message ***
1999-11-01 07:16:15 +00:00
"File %s is under version control. Check it out? "
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-abbreviate-file-name file))))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; if we checked the file out, we should also change the
;; original state of buffer-read-only to nil. If we don't
;; do this, the mode line will show %%, since the file was
;; RO before ediff started, so the user will think the file
;; is checked in.
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ctl-buf
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-change-saved-variable
*** empty log message ***
1996-02-16 06:36:35 +00:00
'buffer-read-only nil buf-type)))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(t
(setq toggle-ro-cmd 'toggle-read-only)
(beep 1) (beep 1)
(message
*** empty log message ***
1996-12-28 02:53:04 +00:00
"Boy, this is risky! Don't modify this file...")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(sit-for 3)))) ; let the user see the warning
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(if (and toggle-ro-cmd
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(string-match "toggle-read-only" (symbol-name toggle-ro-cmd)))
(save-excursion
(save-window-excursion
*** empty log message ***
1996-12-28 02:53:04 +00:00
(select-window (ediff-get-visible-buffer-window buf))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(command-execute toggle-ro-cmd)))
(error "Don't know how to toggle read-only in buffer %S" buf))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; Check if we made the current buffer updatable, but its file is RO.
;; Signal a warning in this case.
(if (and file (not buffer-read-only)
(eq this-command 'ediff-toggle-read-only)
(file-exists-p file)
(not (file-writable-p file)))
(message "Warning: file %s is read-only"
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-abbreviate-file-name file) (beep 1)))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
))))
*** empty log message ***
1996-12-28 02:53:04 +00:00
;; checkout if visited file is checked in
(defun ediff-maybe-checkout (buf)
new version
1998-05-04 22:42:59 +00:00
(let ((file (expand-file-name (buffer-file-name buf)))
*** empty log message ***
1996-12-28 02:53:04 +00:00
(checkout-function (key-binding "\C-x\C-q")))
(if (and (ediff-file-checked-in-p file)
(or (beep 1) t)
(y-or-n-p
(format
*** empty log message ***
1999-11-01 07:16:15 +00:00
"File %s is under version control. Check it out? "
*** empty log message ***
1996-12-28 02:53:04 +00:00
(ediff-abbreviate-file-name file))))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buf
*** empty log message ***
1996-12-28 02:53:04 +00:00
(command-execute checkout-function)))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-12-28 02:53:04 +00:00
;; This is a simple-minded check for whether a file is under version control.
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; If file,v exists but file doesn't, this file is considered to be not checked
;; in and not checked out for the purpose of patching (since patch won't be
;; able to read such a file anyway).
;; FILE is a string representing file name
new version
1998-05-04 22:42:59 +00:00
;;(defun ediff-file-under-version-control (file)
;; (let* ((filedir (file-name-directory file))
;; (file-nondir (file-name-nondirectory file))
;; (trial (concat file-nondir ",v"))
;; (full-trial (concat filedir trial))
;; (full-rcs-trial (concat filedir "RCS/" trial)))
;; (and (stringp file)
;; (file-exists-p file)
;; (or
;; (and
;; (file-exists-p full-trial)
;; ;; in FAT FS, `file,v' and `file' may turn out to be the same!
;; ;; don't be fooled by this!
;; (not (equal (file-attributes file)
;; (file-attributes full-trial))))
;; ;; check if a version is in RCS/ directory
;; (file-exists-p full-rcs-trial)))
;; ))
(defsubst ediff-file-checked-out-p (file)
(or (not (featurep 'vc-hooks))
(and (vc-backend file)
* 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
(if (fboundp 'vc-state)
(or (memq (vc-state file) '(edited needs-merge))
(stringp (vc-state file)))
;; XEmacs has no vc-state
(vc-locking-user file))
)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1998-05-04 22:42:59 +00:00
(defsubst ediff-file-checked-in-p (file)
(and (featurep 'vc-hooks)
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; CVS files are considered not checked in
(not (memq (vc-backend file) '(nil CVS)))
* 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
(if (fboundp 'vc-state)
2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-init.el (ediff-frame-char-height): use frame-selected-window. * ediff-util.el (ediff-file-checked-in-p): changed progn with and * ediff-wind.el (ediff-skip-unsuitable-frames): distinguish selected frame from frame of selected window (ediff-frame-has-dedicated-windows): don't select any frames to avoid changing selected windows (ediff-setup-control-frame): make sure auto-rase is properly set for the control frame
2002-10-12 07:13:59 +00:00
(and
(not (memq (vc-state file) '(edited needs-merge)))
(not (stringp (vc-state file))))
* 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
;; XEmacs has no vc-state
(not (vc-locking-user file)))
))
new version
1998-05-04 22:42:59 +00:00
(defun ediff-file-compressed-p (file)
(condition-case nil
(require 'jka-compr)
(error))
(if (featurep 'jka-compr)
(string-match (jka-compr-build-file-regexp) file)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-swap-buffers ()
"Rotate the display of buffers A, B, and C."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(if (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))
(let ((buf ediff-buffer-A)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(values ediff-buffer-values-orig-A)
Initial revision
1995-03-16 22:34:51 +00:00
(diff-vec ediff-difference-vector-A)
(hide-regexp ediff-regexp-hide-A)
(focus-regexp ediff-regexp-focus-A)
(wide-visibility-p (eq ediff-visible-bounds ediff-wide-bounds))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(overlay (if (ediff-has-face-support-p)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
ediff-current-diff-overlay-A)))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-comparison-job
(progn
(set-window-buffer ediff-window-A ediff-buffer-C)
(set-window-buffer ediff-window-B ediff-buffer-A)
(set-window-buffer ediff-window-C ediff-buffer-B)
)
(set-window-buffer ediff-window-A ediff-buffer-B)
(set-window-buffer ediff-window-B ediff-buffer-A))
;; swap diff buffers
(if ediff-3way-comparison-job
(setq ediff-buffer-A ediff-buffer-C
ediff-buffer-C ediff-buffer-B
ediff-buffer-B buf)
(setq ediff-buffer-A ediff-buffer-B
ediff-buffer-B buf))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; swap saved buffer characteristics
(if ediff-3way-comparison-job
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(setq ediff-buffer-values-orig-A ediff-buffer-values-orig-C
ediff-buffer-values-orig-C ediff-buffer-values-orig-B
ediff-buffer-values-orig-B values)
(setq ediff-buffer-values-orig-A ediff-buffer-values-orig-B
ediff-buffer-values-orig-B values))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; swap diff vectors
(if ediff-3way-comparison-job
(setq ediff-difference-vector-A ediff-difference-vector-C
ediff-difference-vector-C ediff-difference-vector-B
ediff-difference-vector-B diff-vec)
(setq ediff-difference-vector-A ediff-difference-vector-B
ediff-difference-vector-B diff-vec))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; swap hide/focus regexp
(if ediff-3way-comparison-job
(setq ediff-regexp-hide-A ediff-regexp-hide-C
ediff-regexp-hide-C ediff-regexp-hide-B
ediff-regexp-hide-B hide-regexp
ediff-regexp-focus-A ediff-regexp-focus-C
ediff-regexp-focus-C ediff-regexp-focus-B
ediff-regexp-focus-B focus-regexp)
(setq ediff-regexp-hide-A ediff-regexp-hide-B
ediff-regexp-hide-B hide-regexp
ediff-regexp-focus-A ediff-regexp-focus-B
ediff-regexp-focus-B focus-regexp))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; The following is needed for XEmacs, since there one can't move
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; overlay to another buffer. In Emacs, this swap is redundant.
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if (ediff-has-face-support-p)
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-comparison-job
(setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C
ediff-current-diff-overlay-C ediff-current-diff-overlay-B
ediff-current-diff-overlay-B overlay)
(setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
ediff-current-diff-overlay-B overlay)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; swap wide bounds
(setq ediff-wide-bounds
(cond (ediff-3way-comparison-job
(list (nth 2 ediff-wide-bounds)
(nth 0 ediff-wide-bounds)
(nth 1 ediff-wide-bounds)))
(ediff-3way-job
(list (nth 1 ediff-wide-bounds)
(nth 0 ediff-wide-bounds)
(nth 2 ediff-wide-bounds)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(t
Initial revision
1995-03-16 22:34:51 +00:00
(list (nth 1 ediff-wide-bounds)
(nth 0 ediff-wide-bounds)))))
;; swap narrow bounds
(setq ediff-narrow-bounds
(cond (ediff-3way-comparison-job
(list (nth 2 ediff-narrow-bounds)
(nth 0 ediff-narrow-bounds)
(nth 1 ediff-narrow-bounds)))
(ediff-3way-job
(list (nth 1 ediff-narrow-bounds)
(nth 0 ediff-narrow-bounds)
(nth 2 ediff-narrow-bounds)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(t
Initial revision
1995-03-16 22:34:51 +00:00
(list (nth 1 ediff-narrow-bounds)
(nth 0 ediff-narrow-bounds)))))
(if wide-visibility-p
(setq ediff-visible-bounds ediff-wide-bounds)
(setq ediff-visible-bounds ediff-narrow-bounds))
))
(if ediff-3way-job
(ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
(ediff-recenter 'no-rehighlight)
)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-toggle-wide-display ()
"Toggle wide/regular display.
This is especially useful when comparing buffers side-by-side."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(or (ediff-window-display-p)
(error "%sEmacs is not running as a window application"
(if ediff-emacs-p "" "X")))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
(let ((ctl-buf ediff-control-buffer))
(setq ediff-wide-display-p (not ediff-wide-display-p))
(if (not ediff-wide-display-p)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ctl-buf
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(modify-frame-parameters
Initial revision
1995-03-16 22:34:51 +00:00
ediff-wide-display-frame ediff-wide-display-orig-parameters)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;;(sit-for (if ediff-xemacs-p 0.4 0))
Initial revision
1995-03-16 22:34:51 +00:00
;; restore control buf, since ctl window may have been deleted
;; during resizing
(set-buffer ctl-buf)
(setq ediff-wide-display-orig-parameters nil
ediff-window-B nil) ; force update of window config
(ediff-recenter 'no-rehighlight))
(funcall ediff-make-wide-display-function)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;;(sit-for (if ediff-xemacs-p 0.4 0))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ctl-buf
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-window-B nil) ; force update of window config
(ediff-recenter 'no-rehighlight)))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-12-28 02:53:04 +00:00
;;;###autoload
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-toggle-multiframe ()
new version
1997-05-31 01:10:39 +00:00
"Switch from multiframe display to single-frame display and back.
To change the default, set the variable `ediff-window-setup-function',
*** empty log message ***
1996-06-22 01:54:34 +00:00
which see."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive)
new version
1997-05-31 01:10:39 +00:00
(let (window-setup-func)
(or (ediff-window-display-p)
(error "%sEmacs is not running as a window application"
(if ediff-emacs-p "" "X")))
*** empty log message ***
1996-12-28 02:53:04 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
new version
1997-05-31 01:10:39 +00:00
(setq window-setup-func 'ediff-setup-windows-plain))
Initial revision
1995-03-16 22:34:51 +00:00
((eq ediff-window-setup-function 'ediff-setup-windows-plain)
*** empty log message ***
1996-12-28 02:53:04 +00:00
(if (ediff-in-control-buffer-p)
(ediff-kill-bottom-toolbar))
new version
1997-05-31 01:10:39 +00:00
(setq window-setup-func 'ediff-setup-windows-multiframe)))
;; change default
(setq-default ediff-window-setup-function window-setup-func)
;; change in all active ediff sessions
*** empty log message ***
1999-11-01 07:16:15 +00:00
(mapcar (lambda(buf) (ediff-with-current-buffer buf
(setq ediff-window-setup-function window-setup-func
ediff-window-B nil)))
new version
1997-05-31 01:10:39 +00:00
ediff-session-registry)
*** empty log message ***
1996-12-28 02:53:04 +00:00
(if (ediff-in-control-buffer-p)
new version
1997-05-31 01:10:39 +00:00
(ediff-recenter 'no-rehighlight))))
;;;###autoload
(defun ediff-toggle-use-toolbar ()
"Enable or disable Ediff toolbar.
Works only in versions of Emacs that support toolbars.
To change the default, set the variable `ediff-use-toolbar-p', which see."
(interactive)
(if (featurep 'ediff-tbar)
*** empty log message ***
1996-12-28 02:53:04 +00:00
(progn
new version
1997-05-31 01:10:39 +00:00
(or (ediff-window-display-p)
(error "%sEmacs is not running as a window application"
(if ediff-emacs-p "" "X")))
(if (ediff-use-toolbar-p)
(ediff-kill-bottom-toolbar))
;; do this only after killing the toolbar
(setq ediff-use-toolbar-p (not ediff-use-toolbar-p))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
(mapcar (lambda(buf)
(ediff-with-current-buffer buf
;; force redisplay
(setq ediff-window-config-saved "")
))
new version
1997-05-31 01:10:39 +00:00
ediff-session-registry)
(if (ediff-in-control-buffer-p)
(ediff-recenter 'no-rehighlight)))))
*** empty log message ***
1996-12-28 02:53:04 +00:00
;; if was using toolbar, kill it
(defun ediff-kill-bottom-toolbar ()
;; Using ctl-buffer or ediff-control-window for LOCALE does not
;; work properly in XEmacs 19.14: we have to use
;;(selected-frame).
;; The problem with this is that any previous bottom-toolbar
;; will not re-appear after our cleanup here. Is there a way
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; to do "push" and "pop" toolbars ? --marcpa
*** empty log message ***
1996-12-28 02:53:04 +00:00
(if (ediff-use-toolbar-p)
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-cond-compile-for-xemacs-or-emacs
(progn ; xemacs
(set-specifier bottom-toolbar (list (selected-frame) nil))
(set-specifier bottom-toolbar-visible-p (list (selected-frame) nil)))
nil ; emacs
)
))
*** empty log message ***
1996-12-28 02:53:04 +00:00
new version
1997-05-31 01:10:39 +00:00
;; If wants to use toolbar, make it.
;; If not, zero the toolbar for XEmacs.
;; Do nothing for Emacs.
(defun ediff-make-bottom-toolbar (&optional frame)
(if (ediff-window-display-p)
*** empty log message ***
1996-12-28 02:53:04 +00:00
(progn
new version
1997-05-31 01:10:39 +00:00
(setq frame (or frame (selected-frame)))
(cond ((ediff-use-toolbar-p) ; this checks for XEmacs
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-cond-compile-for-xemacs-or-emacs
(progn ; xemacs
(set-specifier
bottom-toolbar
(list frame (if (ediff-3way-comparison-job)
ediff-toolbar-3way ediff-toolbar)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(set-specifier bottom-toolbar-visible-p (list frame t))
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-specifier bottom-toolbar-height
(list frame ediff-toolbar-height)))
nil ; emacs
)
)
new version
1998-05-04 22:42:59 +00:00
((ediff-has-toolbar-support-p)
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-cond-compile-for-xemacs-or-emacs
(set-specifier bottom-toolbar-height (list frame 0)) ; xemacs
nil ; emacs
)
)
new version
1997-05-31 01:10:39 +00:00
))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Merging
(defun ediff-toggle-show-clashes-only ()
*** empty log message ***
1999-11-01 07:16:15 +00:00
"Toggle the mode that shows only the merge regions where both variants differ from the ancestor."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(if (not ediff-merge-with-ancestor-job)
(error "This command makes sense only when merging with an ancestor"))
(setq ediff-show-clashes-only (not ediff-show-clashes-only))
(if ediff-show-clashes-only
(message "Focus on regions where both buffers differ from the ancestor")
(message "Canceling focus on regions where changes clash")))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(defun ediff-toggle-skip-changed-regions ()
"Toggle the mode that skips the merge regions that differ from the default."
(interactive)
(ediff-barf-if-not-control-buffer)
(setq ediff-skip-merge-regions-that-differ-from-default
(not ediff-skip-merge-regions-that-differ-from-default))
(if ediff-skip-merge-regions-that-differ-from-default
(message "Skipping regions that differ from default setting")
(message "Showing regions that differ from default setting")))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Widening/narrowing
(defun ediff-toggle-narrow-region ()
"Toggle narrowing in buffers A, B, and C.
Used in ediff-windows/regions only."
(interactive)
(if (eq ediff-buffer-A ediff-buffer-B)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(error ediff-NO-DIFFERENCES))
Initial revision
1995-03-16 22:34:51 +00:00
(if (eq ediff-visible-bounds ediff-wide-bounds)
(setq ediff-visible-bounds ediff-narrow-bounds)
(setq ediff-visible-bounds ediff-wide-bounds))
(ediff-recenter 'no-rehighlight))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to
Initial revision
1995-03-16 22:34:51 +00:00
;; ediff-wide-bounds, then this actually widens.
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; This function does nothing if job-name is not
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
Initial revision
1995-03-16 22:34:51 +00:00
;; Does nothing if buffer-A = buffer-B since we can't narrow
;; to two different regions in one buffer.
(defun ediff-visible-region ()
(if (or (eq ediff-buffer-A ediff-buffer-B)
(eq ediff-buffer-A ediff-buffer-C)
(eq ediff-buffer-C ediff-buffer-B))
()
;; If ediff-*-regions/windows, ediff-visible-bounds is already set
;; Otherwise, always use full range.
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if (not ediff-narrow-job)
Initial revision
1995-03-16 22:34:51 +00:00
(setq ediff-visible-bounds ediff-wide-bounds))
(let ((overl-A (ediff-get-value-according-to-buffer-type
'A ediff-visible-bounds))
(overl-B (ediff-get-value-according-to-buffer-type
'B ediff-visible-bounds))
(overl-C (ediff-get-value-according-to-buffer-type
'C ediff-visible-bounds))
)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-A
new version
1997-11-01 01:46:51 +00:00
(if (ediff-overlay-buffer overl-A)
(narrow-to-region
(ediff-overlay-start overl-A) (ediff-overlay-end overl-A))))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-B
new version
1997-11-01 01:46:51 +00:00
(if (ediff-overlay-buffer overl-B)
(narrow-to-region
(ediff-overlay-start overl-B) (ediff-overlay-end overl-B))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-11-01 01:46:51 +00:00
(if (and ediff-3way-job (ediff-overlay-buffer overl-C))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
Initial revision
1995-03-16 22:34:51 +00:00
(narrow-to-region
(ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Window scrolling operations
;; Performs some operation on the two file windows (if they are showing).
;; Traps all errors on the operation in windows A/B/C.
;; Usually, errors come from scrolling off the
;; beginning or end of the buffer, and this gives error messages.
(defun ediff-operate-on-windows (operation arg)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; make sure windows aren't dead
(if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
(ediff-recenter 'no-rehighlight))
(if (not (and (ediff-buffer-live-p ediff-buffer-A)
(ediff-buffer-live-p ediff-buffer-B)
(or (not ediff-3way-job) ediff-buffer-C)
))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(error ediff-KILLED-VITAL-BUFFER))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(let* ((wind (selected-window))
(wind-A ediff-window-A)
(wind-B ediff-window-B)
(wind-C ediff-window-C)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(coefA (ediff-get-region-size-coefficient 'A operation))
(coefB (ediff-get-region-size-coefficient 'B operation))
(three-way ediff-3way-job)
(coefC (if three-way
(ediff-get-region-size-coefficient 'C operation))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(select-window wind-A)
(condition-case nil
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(funcall operation (round (* coefA arg)))
Initial revision
1995-03-16 22:34:51 +00:00
(error))
(select-window wind-B)
(condition-case nil
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(funcall operation (round (* coefB arg)))
Initial revision
1995-03-16 22:34:51 +00:00
(error))
(if three-way
(progn
(select-window wind-C)
(condition-case nil
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(funcall operation (round (* coefC arg)))
Initial revision
1995-03-16 22:34:51 +00:00
(error))))
(select-window wind)))
(defun ediff-scroll-vertically (&optional arg)
"Vertically scroll buffers A, B \(and C if appropriate\).
With optional argument ARG, scroll ARG lines; otherwise scroll by nearly
*** empty log message ***
1996-02-16 06:36:35 +00:00
the one half of the height of window-A."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; make sure windows aren't dead
(if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
(ediff-recenter 'no-rehighlight))
(if (not (and (ediff-buffer-live-p ediff-buffer-A)
(ediff-buffer-live-p ediff-buffer-B)
(or (not ediff-3way-job)
(ediff-buffer-live-p ediff-buffer-C))
))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(error ediff-KILLED-VITAL-BUFFER))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-operate-on-windows
(if (memq last-command-char '(?v ?\C-v))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
'scroll-up
Initial revision
1995-03-16 22:34:51 +00:00
'scroll-down)
;; calculate argument to scroll-up/down
;; if there is an explicit argument
(if (and arg (not (equal arg '-)))
;; use it
(prefix-numeric-value arg)
;; if not, see if we can determine a default amount (the window height)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(let (default-amount)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq default-amount
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(- (/ (min (window-height ediff-window-A)
(window-height ediff-window-B)
(if ediff-3way-job
(window-height ediff-window-C)
500)) ; some large number
2)
Initial revision
1995-03-16 22:34:51 +00:00
1 next-screen-context-lines))
;; window found
(if arg
;; C-u as argument means half of default amount
(/ default-amount 2)
;; no argument means default amount
default-amount)))))
(defun ediff-scroll-horizontally (&optional arg)
"Horizontally scroll buffers A, B \(and C if appropriate\).
If an argument is given, that is how many columns are scrolled, else nearly
the width of the A/B/C windows."
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; make sure windows aren't dead
(if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
(ediff-recenter 'no-rehighlight))
(if (not (and (ediff-buffer-live-p ediff-buffer-A)
(ediff-buffer-live-p ediff-buffer-B)
(or (not ediff-3way-job)
(ediff-buffer-live-p ediff-buffer-C))
))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(error ediff-KILLED-VITAL-BUFFER))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-operate-on-windows
(ediff-scroll-horizontally): Arrange for scroll-left and scroll-right being called interactively so that they set the window's min_hscroll.
2001-03-01 14:52:03 +00:00
;; Arrange for scroll-left and scroll-right being called
;; interactively so that they set the window's min_hscroll.
;; Otherwise, automatic hscrolling will undo the effect of
;; hscrolling.
Initial revision
1995-03-16 22:34:51 +00:00
(if (= last-command-char ?<)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(lambda (arg)
(ediff-scroll-horizontally): Arrange for scroll-left and scroll-right being called interactively so that they set the window's min_hscroll.
2001-03-01 14:52:03 +00:00
(let ((prefix-arg arg))
(call-interactively 'scroll-left)))
(lambda (arg)
(let ((prefix-arg arg))
(call-interactively 'scroll-right))))
Initial revision
1995-03-16 22:34:51 +00:00
;; calculate argument to scroll-left/right
;; if there is an explicit argument
(if (and arg (not (equal arg '-)))
;; use it
(prefix-numeric-value arg)
;; if not, see if we can determine a default amount
;; (half the window width)
(if (null ediff-control-window)
;; no control window, use nil
nil
(let ((default-amount
(- (/ (min (window-width ediff-window-A)
(window-width ediff-window-B)
(if ediff-3way-comparison-job
(window-width ediff-window-C)
500) ; some large number
)
2)
3)))
;; window found
(if arg
;; C-u as argument means half of default amount
(/ default-amount 2)
;; no argument means default amount
default-amount))))))
;;BEG, END show the region to be positioned.
*** empty log message ***
1999-11-01 07:16:15 +00:00
;;JOB-NAME holds ediff-job-name. The ediff-windows job positions regions
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;;differently.
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-position-region (beg end pos job-name)
(if (> end (point-max))
(setq end (point-max)))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if ediff-windows-job
Initial revision
1995-03-16 22:34:51 +00:00
(if (pos-visible-in-window-p end)
() ; do nothing, wind is already positioned
;; at this point, windows are positioned at the beginning of the
;; file regions (not diff-regions) being compared.
(save-excursion
(move-to-window-line (- (window-height) 2))
(let ((amount (+ 2 (count-lines (point) end))))
(scroll-up amount))))
(set-window-start (selected-window) beg)
(if (pos-visible-in-window-p end)
;; Determine the number of lines that the region occupies
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((lines 0)
(prev-point 0))
(while ( and (> end (progn
(move-to-window-line lines)
(point)))
;; `end' may be beyond the window bottom, so check
Comment fixes.
1996-01-05 22:21:28 +00:00
;; that we are making progress
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(< prev-point (point)))
(setq prev-point (point))
Initial revision
1995-03-16 22:34:51 +00:00
(setq lines (1+ lines)))
;; And position the beginning on the right line
(goto-char beg)
(recenter (/ (1+ (max (- (1- (window-height (selected-window)))
lines)
1)
)
2))))
(goto-char pos)
))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; get number of lines from window start to region end
(defun ediff-get-lines-to-region-end (buf-type &optional n ctl-buf)
(or n (setq n ediff-current-difference))
(or ctl-buf (setq ctl-buf ediff-control-buffer))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ctl-buf
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(let* ((buf (ediff-get-buffer buf-type))
new version
1997-07-31 04:04:23 +00:00
(wind (eval (ediff-get-symbol-from-alist
buf-type ediff-window-alist)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(beg (window-start wind))
(end (ediff-get-diff-posn buf-type 'end))
lines)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buf
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (< beg end)
(setq lines (count-lines beg end))
(setq lines 0))
lines
))))
new version
1998-05-04 22:42:59 +00:00
;; Calculate the number of lines from window end to the start of diff region
(defun ediff-get-lines-to-region-start (buf-type &optional diff-num ctl-buf)
(or diff-num (setq diff-num ediff-current-difference))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(or ctl-buf (setq ctl-buf ediff-control-buffer))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ctl-buf
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(let* ((buf (ediff-get-buffer buf-type))
new version
1997-07-31 04:04:23 +00:00
(wind (eval (ediff-get-symbol-from-alist
buf-type ediff-window-alist)))
new version
1998-05-04 22:42:59 +00:00
(end (or (window-end wind) (window-end wind t)))
(beg (ediff-get-diff-posn buf-type 'beg diff-num)))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buf
new version
1998-05-04 22:42:59 +00:00
(if (< beg end)
(count-lines (max beg (point-min)) (min end (point-max))) 0))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
)))
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; region size coefficient is a coefficient by which to adjust scrolling
;; up/down of the window displaying buffer of type BUFTYPE.
;; The purpose of this coefficient is to make the windows scroll in sync, so
;; that it won't happen that one diff region is scrolled off while the other is
;; still seen.
;;
;; If the difference region is invalid, the coefficient is 1
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-get-region-size-coefficient (buf-type op &optional n ctl-buf)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer (or ctl-buf ediff-control-buffer)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(if (ediff-valid-difference-p n)
(let* ((func (cond ((eq op 'scroll-down)
'ediff-get-lines-to-region-start)
((eq op 'scroll-up)
'ediff-get-lines-to-region-end)
(t '(lambda (a b c) 0))))
(max-lines (max (funcall func 'A n ctl-buf)
(funcall func 'B n ctl-buf)
(if (ediff-buffer-live-p ediff-buffer-C)
(funcall func 'C n ctl-buf)
0))))
;; this covers the horizontal coefficient as well:
;; if max-lines = 0 then coef = 1
(if (> max-lines 0)
(/ (+ (funcall func buf-type n ctl-buf) 0.0)
(+ max-lines 0.0))
1))
1)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-next-difference (&optional arg)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
"Advance to the next difference.
*** empty log message ***
1996-06-22 01:54:34 +00:00
With a prefix argument, go forward that many differences."
(interactive "p")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(if (< ediff-current-difference ediff-number-of-differences)
(let ((n (min ediff-number-of-differences
(ediff-next-difference, ediff-previous-difference): Handle nil as arg.
1998-08-14 04:12:01 +00:00
(+ ediff-current-difference (or arg 1))))
*** empty log message ***
1999-11-01 07:16:15 +00:00
non-clash-skip skip-changed regexp-skip)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-05-31 01:10:39 +00:00
(ediff-visible-region)
Initial revision
1995-03-16 22:34:51 +00:00
(or (>= n ediff-number-of-differences)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
new version
1997-09-30 01:13:53 +00:00
;; this won't exec if regexp-skip is t
*** empty log message ***
1999-11-01 07:16:15 +00:00
(setq non-clash-skip (ediff-merge-region-is-non-clash n)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
skip-changed
*** empty log message ***
1999-11-01 07:16:15 +00:00
(ediff-skip-merge-region-if-changed-from-default-p n))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-install-fine-diff-if-necessary n))
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; Skip loop
Initial revision
1995-03-16 22:34:51 +00:00
(while (and (< n ediff-number-of-differences)
(or
;; regexp skip
regexp-skip
;; skip clashes, if necessary
new version
1997-09-30 01:13:53 +00:00
non-clash-skip
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; skip processed regions
skip-changed
Initial revision
1995-03-16 22:34:51 +00:00
;; skip difference regions that differ in white space
(and ediff-ignore-similar-regions
*** empty log message ***
1999-11-01 07:16:15 +00:00
(or (eq (ediff-no-fine-diffs-p n) t)
(and (ediff-merge-job)
(eq (ediff-no-fine-diffs-p n) 'C)))
)))
Initial revision
1995-03-16 22:34:51 +00:00
(setq n (1+ n))
(if (= 0 (mod n 20))
(message "Skipped over region %d and counting ..." n))
(or (>= n ediff-number-of-differences)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
new version
1997-09-30 01:13:53 +00:00
;; this won't exec if regexp-skip is t
*** empty log message ***
1999-11-01 07:16:15 +00:00
(setq non-clash-skip (ediff-merge-region-is-non-clash n)
skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-install-fine-diff-if-necessary n))
)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(message "")
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-unselect-and-select-difference n)
) ; let
(ediff-visible-region)
(error "At end of the difference list")))
(defun ediff-previous-difference (&optional arg)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
"Go to the previous difference.
Initial revision
1995-03-16 22:34:51 +00:00
With a prefix argument, go back that many differences."
*** empty log message ***
1996-06-22 01:54:34 +00:00
(interactive "p")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(if (> ediff-current-difference -1)
(ediff-next-difference, ediff-previous-difference): Handle nil as arg.
1998-08-14 04:12:01 +00:00
(let ((n (max -1 (- ediff-current-difference (or arg 1))))
*** empty log message ***
1999-11-01 07:16:15 +00:00
non-clash-skip skip-changed regexp-skip)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-05-31 01:10:39 +00:00
(ediff-visible-region)
Initial revision
1995-03-16 22:34:51 +00:00
(or (< n 0)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
new version
1997-09-30 01:13:53 +00:00
;; this won't exec if regexp-skip is t
*** empty log message ***
1999-11-01 07:16:15 +00:00
(setq non-clash-skip (ediff-merge-region-is-non-clash n)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
skip-changed
*** empty log message ***
1999-11-01 07:16:15 +00:00
(ediff-skip-merge-region-if-changed-from-default-p n))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-install-fine-diff-if-necessary n))
(while (and (> n -1)
(or
;; regexp skip
regexp-skip
;; skip clashes, if necessary
new version
1997-09-30 01:13:53 +00:00
non-clash-skip
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; skipp changed regions
skip-changed
Initial revision
1995-03-16 22:34:51 +00:00
;; skip difference regions that differ in white space
(and ediff-ignore-similar-regions
*** empty log message ***
1999-11-01 07:16:15 +00:00
(or (eq (ediff-no-fine-diffs-p n) t)
(and (ediff-merge-job)
(eq (ediff-no-fine-diffs-p n) 'C)))
)))
Initial revision
1995-03-16 22:34:51 +00:00
(if (= 0 (mod (1+ n) 20))
(message "Skipped over region %d and counting ..." (1+ n)))
(setq n (1- n))
(or (< n 0)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
new version
1997-09-30 01:13:53 +00:00
;; this won't exec if regexp-skip is t
*** empty log message ***
1999-11-01 07:16:15 +00:00
(setq non-clash-skip (ediff-merge-region-is-non-clash n)
skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-install-fine-diff-if-necessary n))
)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(message "")
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-unselect-and-select-difference n)
) ; let
(ediff-visible-region)
(error "At beginning of the difference list")))
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; The diff number is as perceived by the user (i.e., 1+ the internal
;; representation)
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-jump-to-difference (difference-number)
*** empty log message ***
1996-06-22 01:54:34 +00:00
"Go to the difference specified as a prefix argument.
If the prefix is negative, count differences from the end."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive "p")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(setq difference-number
(cond ((< difference-number 0)
(+ ediff-number-of-differences difference-number))
((> difference-number 0) (1- difference-number))
(t -1)))
;; -1 is allowed by ediff-unselect-and-select-difference --- it is the
;; position before the first one.
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if (and (>= difference-number -1)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(<= difference-number ediff-number-of-differences))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-unselect-and-select-difference difference-number)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(error ediff-BAD-DIFF-NUMBER
this-command (1+ difference-number) ediff-number-of-differences)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-06-22 01:54:34 +00:00
(defun ediff-jump-to-difference-at-point (arg)
Initial revision
1995-03-16 22:34:51 +00:00
"Go to difference closest to the point in buffer A, B, or C.
*** empty log message ***
1996-06-22 01:54:34 +00:00
The buffer depends on last command character \(a, b, or c\) that invoked this
*** empty log message ***
1999-11-01 07:16:15 +00:00
command. For instance, if the command was `ga' then the point value in buffer
A is used.
*** empty log message ***
1996-06-22 01:54:34 +00:00
With a prefix argument, synchronize all files around the current point position
in the specified buffer."
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(let* ((buf-type (ediff-char-to-buftype last-command-char))
(buffer (ediff-get-buffer buf-type))
new version
1997-07-31 04:04:23 +00:00
(pt (ediff-with-current-buffer buffer (point)))
*** empty log message ***
1996-06-22 01:54:34 +00:00
(diff-no (ediff-diff-at-point buf-type nil (if arg 'after)))
(past-last-diff (< ediff-number-of-differences diff-no))
(beg (if past-last-diff
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer (point-max))
*** empty log message ***
1996-06-22 01:54:34 +00:00
(ediff-get-diff-posn buf-type 'beg (1- diff-no))))
ctl-wind wind-A wind-B wind-C
shift)
(if past-last-diff
(ediff-jump-to-difference -1)
(ediff-jump-to-difference diff-no))
(setq ctl-wind (selected-window)
wind-A ediff-window-A
wind-B ediff-window-B
wind-C ediff-window-C)
(if arg
(progn
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer
*** empty log message ***
1996-06-22 01:54:34 +00:00
(setq shift (- beg pt)))
(select-window wind-A)
(if past-last-diff (goto-char (point-max)))
(condition-case nil
(backward-char shift) ; noerror, if beginning of buffer
(error))
(recenter)
(select-window wind-B)
(if past-last-diff (goto-char (point-max)))
(condition-case nil
(backward-char shift) ; noerror, if beginning of buffer
(error))
(recenter)
(if (window-live-p wind-C)
(progn
(select-window wind-C)
(if past-last-diff (goto-char (point-max)))
(condition-case nil
(backward-char shift) ; noerror, if beginning of buffer
(error))
(recenter)
))
(select-window ctl-wind)
))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; find region most related to the current point position (or POS, if given)
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; returns diff number as seen by the user (i.e., 1+ the internal
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; representation)
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; The optional argument WHICH-DIFF can be `after' or `before'. If `after',
;; find the diff after the point. If `before', find the diff before the
;; point. If the point is inside a diff, return that diff.
*** empty log message ***
1996-06-22 01:54:34 +00:00
(defun ediff-diff-at-point (buf-type &optional pos which-diff)
Initial revision
1995-03-16 22:34:51 +00:00
(let ((buffer (ediff-get-buffer buf-type))
(ctl-buffer ediff-control-buffer)
(max-dif-num (1- ediff-number-of-differences))
(diff-no -1)
(prev-beg 0)
(prev-end 0)
(beg 0)
(end 0))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer
Initial revision
1995-03-16 22:34:51 +00:00
(setq pos (or pos (point)))
(while (and (or (< pos prev-beg) (> pos beg))
(< diff-no max-dif-num))
(setq diff-no (1+ diff-no))
(setq prev-beg beg
prev-end end)
(setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; boost diff-no by 1, if past the last diff region
(if (and (memq which-diff '(after before))
(> pos beg) (= diff-no max-dif-num))
(setq diff-no (1+ diff-no)))
(cond ((eq which-diff 'after) (1+ diff-no))
((eq which-diff 'before) diff-no)
((< (abs (count-lines pos (max 1 prev-end)))
(abs (count-lines pos (max 1 beg))))
diff-no) ; choose prev difference
(t
(1+ diff-no))) ; choose next difference
Initial revision
1995-03-16 22:34:51 +00:00
)))
;;; Copying diffs.
(defun ediff-diff-to-diff (arg &optional keys)
*** empty log message ***
1996-02-16 06:36:35 +00:00
"Copy buffer-X'th difference region to buffer Y \(X,Y are A, B, or C\).
If numerical prefix argument, copy the difference specified in the arg.
Initial revision
1995-03-16 22:34:51 +00:00
Otherwise, copy the difference given by `ediff-current-difference'.
This command assumes it is bound to a 2-character key sequence, `ab', `ba',
`ac', etc., which is used to determine the types of buffers to be used for
*** empty log message ***
1999-11-01 07:16:15 +00:00
copying difference regions. The first character in the sequence specifies
Initial revision
1995-03-16 22:34:51 +00:00
the source buffer and the second specifies the target.
If the second optional argument, a 2-character string, is given, use it to
determine the source and the target buffers instead of the command keys."
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(or keys (setq keys (this-command-keys)))
*** empty log message ***
1996-06-22 01:54:34 +00:00
(if (eq arg '-) (setq arg -1)) ; translate neg arg to -1
(if (numberp arg) (ediff-jump-to-difference arg))
Initial revision
1995-03-16 22:34:51 +00:00
(let* ((key1 (aref keys 0))
(key2 (aref keys 1))
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
(char1 (ediff-event-key key1))
(char2 (ediff-event-key key2))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
ediff-verbose-p)
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-copy-diff ediff-current-difference
(ediff-char-to-buftype char1)
(ediff-char-to-buftype char2))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; recenter with rehighlighting, but no messages
(ediff-recenter)))
Initial revision
1995-03-16 22:34:51 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
(defun ediff-copy-A-to-B (arg)
"Copy ARGth difference region from buffer A to B.
*** empty log message ***
1999-11-01 07:16:15 +00:00
ARG is a prefix argument. If nil, copy the current difference region."
*** empty log message ***
1996-02-16 06:36:35 +00:00
(interactive "P")
(ediff-diff-to-diff arg "ab"))
(defun ediff-copy-B-to-A (arg)
"Copy ARGth difference region from buffer B to A.
*** empty log message ***
1999-11-01 07:16:15 +00:00
ARG is a prefix argument. If nil, copy the current difference region."
*** empty log message ***
1996-02-16 06:36:35 +00:00
(interactive "P")
(ediff-diff-to-diff arg "ba"))
(defun ediff-copy-A-to-C (arg)
"Copy ARGth difference region from buffer A to buffer C.
*** empty log message ***
1999-11-01 07:16:15 +00:00
ARG is a prefix argument. If nil, copy the current difference region."
*** empty log message ***
1996-02-16 06:36:35 +00:00
(interactive "P")
(ediff-diff-to-diff arg "ac"))
(defun ediff-copy-B-to-C (arg)
"Copy ARGth difference region from buffer B to buffer C.
*** empty log message ***
1999-11-01 07:16:15 +00:00
ARG is a prefix argument. If nil, copy the current difference region."
*** empty log message ***
1996-02-16 06:36:35 +00:00
(interactive "P")
(ediff-diff-to-diff arg "bc"))
(defun ediff-copy-C-to-B (arg)
"Copy ARGth difference region from buffer C to B.
*** empty log message ***
1999-11-01 07:16:15 +00:00
ARG is a prefix argument. If nil, copy the current difference region."
*** empty log message ***
1996-02-16 06:36:35 +00:00
(interactive "P")
(ediff-diff-to-diff arg "cb"))
(defun ediff-copy-C-to-A (arg)
"Copy ARGth difference region from buffer C to A.
*** empty log message ***
1999-11-01 07:16:15 +00:00
ARG is a prefix argument. If nil, copy the current difference region."
*** empty log message ***
1996-02-16 06:36:35 +00:00
(interactive "P")
(ediff-diff-to-diff arg "ca"))
Initial revision
1995-03-16 22:34:51 +00:00
;; Copy diff N from FROM-BUF-TYPE \(given as A, B or C\) to TO-BUF-TYPE.
;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; target diff. This is used in merging, when constructing the merged
Initial revision
1995-03-16 22:34:51 +00:00
;; version.
(defun ediff-copy-diff (n from-buf-type to-buf-type
&optional batch-invocation reg-to-copy)
(let* ((to-buf (ediff-get-buffer to-buf-type))
;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type)))
(ctrl-buf ediff-control-buffer)
(saved-p t)
(three-way ediff-3way-job)
messg
ediff-verbose-p
reg-to-delete reg-to-delete-beg reg-to-delete-end)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq reg-to-delete-beg
(ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
(setq reg-to-delete-end
(ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if reg-to-copy
(setq from-buf-type nil)
(setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq reg-to-delete (ediff-get-region-contents
n to-buf-type ctrl-buf
reg-to-delete-beg reg-to-delete-end))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if (string= reg-to-delete reg-to-copy)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(setq saved-p nil) ; don't copy identical buffers
Initial revision
1995-03-16 22:34:51 +00:00
;; seems ok to copy
(if (or batch-invocation (ediff-test-save-region n to-buf-type))
(condition-case conds
(progn
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer to-buf
Initial revision
1995-03-16 22:34:51 +00:00
;; to prevent flags from interfering if buffer is writable
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((inhibit-read-only (null buffer-read-only)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(goto-char reg-to-delete-end)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(insert reg-to-copy)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if (> reg-to-delete-end reg-to-delete-beg)
(kill-region reg-to-delete-beg reg-to-delete-end))
Initial revision
1995-03-16 22:34:51 +00:00
))
(or batch-invocation
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq
Initial revision
1995-03-16 22:34:51 +00:00
messg
(ediff-save-diff-region n to-buf-type reg-to-delete))))
(error (message "ediff-copy-diff: %s %s"
(car conds)
(mapconcat 'prin1-to-string (cdr conds) " "))
(beep 1)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(sit-for 2) ; let the user see the error msg
Initial revision
1995-03-16 22:34:51 +00:00
(setq saved-p nil)
)))
)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; adjust state of difference in case 3-way and diff was copied ok
(if (and saved-p three-way)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
Initial revision
1995-03-16 22:34:51 +00:00
(if batch-invocation
(ediff-clear-fine-differences n)
;; If diff3 job, we should recompute fine diffs so we clear them
;; before reinserting flags (and thus before ediff-recenter).
(if (and saved-p three-way)
(ediff-clear-fine-differences n))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-refresh-mode-lines)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; For diff2 jobs, don't recompute fine diffs, since we know there
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; aren't any. So we clear diffs after ediff-recenter.
Initial revision
1995-03-16 22:34:51 +00:00
(if (and saved-p (not three-way))
(ediff-clear-fine-differences n))
;; Make sure that the message about saving and how to restore is seen
;; by the user
(message messg))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG
;; is the region to save. It is redundant here, but is passed anyway, for
;; convenience.
(defun ediff-save-diff-region (n buf-type reg)
(let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
(buf (ediff-get-buffer buf-type))
(this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if this-buf-n-th-diff-saved
;; either nothing saved for n-th diff and buffer or we OK'ed
;; overriding
(setcdr this-buf-n-th-diff-saved reg)
(if n-th-diff-saved ;; n-th diff saved, but for another buffer
(nconc n-th-diff-saved (list (cons buf reg)))
(setq ediff-killed-diffs-alist ;; create record for n-th diff
(cons (list n (cons buf reg))
ediff-killed-diffs-alist))))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(message "Saving old diff region #%d of buffer %S. To recover, type `r%s'"
Initial revision
1995-03-16 22:34:51 +00:00
(1+ n) buf-type
(if ediff-merge-job
"" (downcase (symbol-name buf-type))))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
(defun ediff-test-save-region (n buf-type)
(let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
(buf (ediff-get-buffer buf-type))
(this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if this-buf-n-th-diff-saved
(if (yes-or-no-p
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
*** empty log message ***
1999-11-01 07:16:15 +00:00
"You've previously copied diff region %d to buffer %S. Confirm "
Initial revision
1995-03-16 22:34:51 +00:00
(1+ n) buf-type))
t
(error "Quit"))
t)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-pop-diff (n buf-type)
"Pop last killed Nth diff region from buffer BUF-TYPE."
(let* ((n-th-record (assoc n ediff-killed-diffs-alist))
(buf (ediff-get-buffer buf-type))
(saved-rec (assoc buf (cdr n-th-record)))
(three-way ediff-3way-job)
(ctl-buf ediff-control-buffer)
ediff-verbose-p
saved-diff reg-beg reg-end recovered)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if (cdr saved-rec)
(setq saved-diff (cdr saved-rec))
(if (> ediff-number-of-differences 0)
(error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(error ediff-NO-DIFFERENCES)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer))
(setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(condition-case conds
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buf
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((inhibit-read-only (null buffer-read-only)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(goto-char reg-end)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(insert saved-diff)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if (> reg-end reg-beg)
(kill-region reg-beg reg-end))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(setq recovered t)
))
(error (message "ediff-pop-diff: %s %s"
(car conds)
(mapconcat 'prin1-to-string (cdr conds) " "))
(beep 1)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; Clearing fine diffs is necessary for
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; ediff-unselect-and-select-difference to properly recompute them. We
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; can't rely on ediff-copy-diff to clear this vector, as the user might
;; have modified diff regions after copying and, thus, may have recomputed
;; fine diffs.
Initial revision
1995-03-16 22:34:51 +00:00
(if recovered
(ediff-clear-fine-differences n))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; adjust state of difference
(if (and three-way recovered)
(ediff-set-state-of-diff-in-all-buffers n ctl-buf))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-refresh-mode-lines)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if recovered
(progn
(setq n-th-record (delq saved-rec n-th-record))
(message "Diff region %d in buffer %S restored" (1+ n) buf-type)
))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-restore-diff (arg &optional key)
"Restore ARGth diff from `ediff-killed-diffs-alist'.
*** empty log message ***
1996-02-16 06:36:35 +00:00
ARG is a prefix argument. If ARG is nil, restore the current-difference.
Initial revision
1995-03-16 22:34:51 +00:00
If the second optional argument, a character, is given, use it to
determine the target buffer instead of last-command-char"
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if (numberp arg)
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-jump-to-difference arg))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-pop-diff ediff-current-difference
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-char-to-buftype (or key last-command-char)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;; recenter with rehighlighting, but no messages
(let (ediff-verbose-p)
(ediff-recenter)))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(defun ediff-restore-diff-in-merge-buffer (arg)
"Restore ARGth diff in the merge buffer.
*** empty log message ***
1999-11-01 07:16:15 +00:00
ARG is a prefix argument. If nil, restore the current diff."
*** empty log message ***
1996-02-16 06:36:35 +00:00
(interactive "P")
(ediff-restore-diff arg ?c))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-toggle-regexp-match ()
"Toggle between focusing and hiding of difference regions that match
a regular expression typed in by the user."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(let ((regexp-A "")
(regexp-B "")
(regexp-C "")
msg-connective alt-msg-connective alt-connective)
(cond
((or (and (eq ediff-skip-diff-region-function
*** empty log message ***
1996-06-22 01:54:34 +00:00
ediff-focus-on-regexp-matches-function)
Initial revision
1995-03-16 22:34:51 +00:00
(eq last-command-char ?f))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(and (eq ediff-skip-diff-region-function
ediff-hide-regexp-matches-function)
Initial revision
1995-03-16 22:34:51 +00:00
(eq last-command-char ?h)))
(message "Selective browsing by regexp turned off")
(setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
((eq last-command-char ?h)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
regexp-A
Initial revision
1995-03-16 22:34:51 +00:00
(read-string
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
Initial revision
1995-03-16 22:34:51 +00:00
"Ignore A-regions matching this regexp (default \"%s\"): "
ediff-regexp-hide-A))
regexp-B
(read-string
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
Initial revision
1995-03-16 22:34:51 +00:00
"Ignore B-regions matching this regexp (default \"%s\"): "
ediff-regexp-hide-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
Initial revision
1995-03-16 22:34:51 +00:00
"Ignore C-regions matching this regexp (default \"%s\"): "
ediff-regexp-hide-C))))
(if (eq ediff-hide-regexp-connective 'and)
(setq msg-connective "BOTH"
alt-msg-connective "ONE OF"
alt-connective 'or)
(setq msg-connective "ONE OF"
alt-msg-connective "BOTH"
alt-connective 'and))
(if (y-or-n-p
(format
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
"Ignore regions that match %s regexps, OK? "
Initial revision
1995-03-16 22:34:51 +00:00
msg-connective alt-msg-connective))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(message "Will ignore regions that match %s regexps" msg-connective)
(setq ediff-hide-regexp-connective alt-connective)
(message "Will ignore regions that match %s regexps"
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
alt-msg-connective))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
(or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
(or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
((eq last-command-char ?f)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq ediff-skip-diff-region-function
ediff-focus-on-regexp-matches-function
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
regexp-A
Initial revision
1995-03-16 22:34:51 +00:00
(read-string
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
Initial revision
1995-03-16 22:34:51 +00:00
"Focus on A-regions matching this regexp (default \"%s\"): "
ediff-regexp-focus-A))
regexp-B
(read-string
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
Initial revision
1995-03-16 22:34:51 +00:00
"Focus on B-regions matching this regexp (default \"%s\"): "
ediff-regexp-focus-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
Initial revision
1995-03-16 22:34:51 +00:00
"Focus on C-regions matching this regexp (default \"%s\"): "
ediff-regexp-focus-C))))
(if (eq ediff-focus-regexp-connective 'and)
(setq msg-connective "BOTH"
alt-msg-connective "ONE OF"
alt-connective 'or)
(setq msg-connective "ONE OF"
alt-msg-connective "BOTH"
alt-connective 'and))
(if (y-or-n-p
(format
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
"Focus on regions that match %s regexps, OK? "
Initial revision
1995-03-16 22:34:51 +00:00
msg-connective alt-msg-connective))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(message "Will focus on regions that match %s regexps"
msg-connective)
(setq ediff-focus-regexp-connective alt-connective)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(message "Will focus on regions that match %s regexps"
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
alt-msg-connective))
Initial revision
1995-03-16 22:34:51 +00:00
(or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
(or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
(or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-toggle-skip-similar ()
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(if (not (eq ediff-auto-refine 'on))
(error
"Can't skip over whitespace regions: first turn auto-refining on"))
(setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions))
(if ediff-ignore-similar-regions
(message
"Skipping regions that differ only in white space & line breaks")
(message "Skipping over white-space differences turned off")))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-focus-on-regexp-matches (n)
"Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Regions to be ignored according to this function are those where
Initial revision
1995-03-16 22:34:51 +00:00
buf A region doesn't match `ediff-regexp-focus-A' and buf B region
doesn't match `ediff-regexp-focus-B'.
This function returns nil if the region number N (specified as
an argument) is not to be ignored and t if region N is to be ignored.
*** empty log message ***
1999-11-01 07:16:15 +00:00
N is a region number used by Ediff internally. It is 1 less
Initial revision
1995-03-16 22:34:51 +00:00
the number seen by the user."
(if (ediff-valid-difference-p n)
(let* ((ctl-buf ediff-control-buffer)
(regex-A ediff-regexp-focus-A)
(regex-B ediff-regexp-focus-B)
(regex-C ediff-regexp-focus-C)
new version
1997-07-31 04:04:23 +00:00
(reg-A-match (ediff-with-current-buffer ediff-buffer-A
*** empty log message ***
1996-02-16 06:36:35 +00:00
(save-restriction
(narrow-to-region
(ediff-get-diff-posn 'A 'beg n ctl-buf)
(ediff-get-diff-posn 'A 'end n ctl-buf))
(goto-char (point-min))
(re-search-forward regex-A nil t))))
new version
1997-07-31 04:04:23 +00:00
(reg-B-match (ediff-with-current-buffer ediff-buffer-B
*** empty log message ***
1996-02-16 06:36:35 +00:00
(save-restriction
(narrow-to-region
(ediff-get-diff-posn 'B 'beg n ctl-buf)
(ediff-get-diff-posn 'B 'end n ctl-buf))
(re-search-forward regex-B nil t))))
Initial revision
1995-03-16 22:34:51 +00:00
(reg-C-match (if ediff-3way-comparison-job
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
*** empty log message ***
1996-02-16 06:36:35 +00:00
(save-restriction
(narrow-to-region
(ediff-get-diff-posn 'C 'beg n ctl-buf)
(ediff-get-diff-posn 'C 'end n ctl-buf))
(re-search-forward regex-C nil t))))))
Initial revision
1995-03-16 22:34:51 +00:00
(not (eval (if ediff-3way-comparison-job
(list ediff-focus-regexp-connective
reg-A-match reg-B-match reg-C-match)
(list ediff-focus-regexp-connective
reg-A-match reg-B-match))))
)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(defun ediff-hide-regexp-matches (n)
Initial revision
1995-03-16 22:34:51 +00:00
"Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
Regions to be ignored are those where buf A region matches
`ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
This function returns nil if the region number N (specified as
an argument) is not to be ignored and t if region N is to be ignored.
*** empty log message ***
1999-11-01 07:16:15 +00:00
N is a region number used by Ediff internally. It is 1 less
Initial revision
1995-03-16 22:34:51 +00:00
the number seen by the user."
(if (ediff-valid-difference-p n)
(let* ((ctl-buf ediff-control-buffer)
(regex-A ediff-regexp-hide-A)
(regex-B ediff-regexp-hide-B)
(regex-C ediff-regexp-hide-C)
new version
1997-07-31 04:04:23 +00:00
(reg-A-match (ediff-with-current-buffer ediff-buffer-A
*** empty log message ***
1996-02-16 06:36:35 +00:00
(save-restriction
(narrow-to-region
(ediff-get-diff-posn 'A 'beg n ctl-buf)
(ediff-get-diff-posn 'A 'end n ctl-buf))
(goto-char (point-min))
(re-search-forward regex-A nil t))))
new version
1997-07-31 04:04:23 +00:00
(reg-B-match (ediff-with-current-buffer ediff-buffer-B
*** empty log message ***
1996-02-16 06:36:35 +00:00
(save-restriction
(narrow-to-region
(ediff-get-diff-posn 'B 'beg n ctl-buf)
(ediff-get-diff-posn 'B 'end n ctl-buf))
(goto-char (point-min))
(re-search-forward regex-B nil t))))
Initial revision
1995-03-16 22:34:51 +00:00
(reg-C-match (if ediff-3way-comparison-job
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
*** empty log message ***
1996-02-16 06:36:35 +00:00
(save-restriction
(narrow-to-region
(ediff-get-diff-posn 'C 'beg n ctl-buf)
(ediff-get-diff-posn 'C 'end n ctl-buf))
(goto-char (point-min))
(re-search-forward regex-C nil t))))))
Initial revision
1995-03-16 22:34:51 +00:00
(eval (if ediff-3way-comparison-job
(list ediff-hide-regexp-connective
reg-A-match reg-B-match reg-C-match)
(list ediff-hide-regexp-connective reg-A-match reg-B-match)))
)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;;; Quitting, suspending, etc.
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-quit (reverse-default-keep-variants)
Initial revision
1995-03-16 22:34:51 +00:00
"Finish an Ediff session and exit Ediff.
Unselects the selected difference, if any, restores the read-only and modified
flags of the compared file buffers, kills Ediff buffers for this session
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
\(but not buffers A, B, C\).
If `ediff-keep-variants' is nil, the user will be asked whether the buffers
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
containing the variants should be removed \(if they haven't been modified\).
If it is t, they will be preserved unconditionally. A prefix argument,
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
temporarily reverses the meaning of this variable."
(interactive "P")
(ediff-barf-if-not-control-buffer)
new version
1997-05-31 01:10:39 +00:00
(let ((ctl-buf (current-buffer)))
(if (y-or-n-p (format "Quit this Ediff session%s? "
(if (ediff-buffer-live-p ediff-meta-buffer)
" & show containing session group" "")))
(progn
(message "")
(set-buffer ctl-buf)
(ediff-really-quit reverse-default-keep-variants))
(message ""))))
Initial revision
1995-03-16 22:34:51 +00:00
;; Perform the quit operations.
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-really-quit (reverse-default-keep-variants)
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-unhighlight-diffs-totally)
(ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
(ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
(ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-clear-diff-vector 'ediff-difference-vector-Ancestor 'fine-diffs-also)
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-delete-temp-files)
Trailing whitespace deleted.
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
;; Restore the visibility range. This affects only ediff-*-regions/windows.
Initial revision
1995-03-16 22:34:51 +00:00
;; Since for other job names ediff-visible-region sets
;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
;; ignored for such jobs.
(if ediff-quit-widened
(setq ediff-visible-bounds ediff-wide-bounds)
(setq ediff-visible-bounds ediff-narrow-bounds))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Apply selective display to narrow or widen
(ediff-visible-region)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(mapcar (lambda (overl)
(if (ediff-overlayp overl)
(ediff-delete-overlay overl)))
Initial revision
1995-03-16 22:34:51 +00:00
ediff-wide-bounds)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(mapcar (lambda (overl)
(if (ediff-overlayp overl)
(ediff-delete-overlay overl)))
Initial revision
1995-03-16 22:34:51 +00:00
ediff-narrow-bounds)
*** empty log message ***
1996-09-20 01:10:05 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; restore buffer mode line id's in buffer-A/B/C
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(let ((control-buffer ediff-control-buffer)
*** empty log message ***
1996-09-20 01:10:05 +00:00
(meta-buffer ediff-meta-buffer)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(after-quit-hook-internal ediff-after-quit-hook-internal)
new version
1997-11-01 01:46:51 +00:00
(session-number ediff-meta-session-number)
*** empty log message ***
1996-09-20 01:10:05 +00:00
;; suitable working frame
(warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(cond ((window-live-p ediff-window-A)
*** empty log message ***
1996-09-20 01:10:05 +00:00
(window-frame ediff-window-A))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
((window-live-p ediff-window-B)
*** empty log message ***
1996-09-20 01:10:05 +00:00
(window-frame ediff-window-B))
(t (next-frame))))))
Initial revision
1995-03-16 22:34:51 +00:00
(condition-case nil
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-A
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq ediff-this-buffer-ediff-sessions
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(delq control-buffer ediff-this-buffer-ediff-sessions))
Initial revision
1995-03-16 22:34:51 +00:00
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
)
(error))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(condition-case nil
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-B
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq ediff-this-buffer-ediff-sessions
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(delq control-buffer ediff-this-buffer-ediff-sessions))
Initial revision
1995-03-16 22:34:51 +00:00
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
)
(error))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(condition-case nil
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq ediff-this-buffer-ediff-sessions
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(delq control-buffer ediff-this-buffer-ediff-sessions))
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
)
(error))
(condition-case nil
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-ancestor-buffer
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq ediff-this-buffer-ediff-sessions
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(delq control-buffer ediff-this-buffer-ediff-sessions))
Initial revision
1995-03-16 22:34:51 +00:00
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
)
(error))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(setq ediff-session-registry
(delq ediff-control-buffer ediff-session-registry))
(ediff-update-registry)
Initial revision
1995-03-16 22:34:51 +00:00
;; restore state of buffers to what it was before ediff
(ediff-restore-protected-variables)
*** empty log message ***
1996-09-20 01:10:05 +00:00
;; If the user interrupts (canceling saving the merge buffer), continue
;; normally.
(condition-case nil
(if (ediff-merge-job)
(run-hooks 'ediff-quit-merge-hook))
(quit))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-cleanup-hook)
*** empty log message ***
1999-11-01 07:16:15 +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
(ediff-janitor
'ask
;; reverse-default-keep-variants is t if the user quits with a prefix arg
(if reverse-default-keep-variants
(not ediff-keep-variants)
ediff-keep-variants))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; one hook here is ediff-cleanup-mess, which kills the control buffer and
;; other auxiliary buffers. we made it into a hook to let the users do their
;; own cleanup, if needed.
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-quit-hook)
new version
1997-11-01 01:46:51 +00:00
(ediff-update-meta-buffer meta-buffer nil session-number)
*** empty log message ***
1996-09-20 01:10:05 +00:00
;; warp mouse into a working window
(setq warp-frame ; if mouse is over a reasonable frame, use it
new version
1997-09-11 16:08:19 +00:00
(cond ((ediff-good-frame-under-mouse))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(t warp-frame)))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(if (and (ediff-window-display-p) (frame-live-p warp-frame) ediff-grab-mouse)
*** empty log message ***
1996-09-20 01:10:05 +00:00
(set-mouse-position (if ediff-emacs-p
warp-frame
(frame-selected-window warp-frame))
2 1))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(run-hooks 'after-quit-hook-internal)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
))
new version
1997-09-11 16:08:19 +00:00
;; Returns frame under mouse, if this frame is not a minibuffer
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; frame. Otherwise: nil
new version
1997-09-11 16:08:19 +00:00
(defun ediff-good-frame-under-mouse ()
(let ((frame-or-win (car (mouse-position)))
(buf-name "")
frame obj-ok)
(setq obj-ok
(if ediff-emacs-p
(frame-live-p frame-or-win)
(window-live-p frame-or-win)))
(if obj-ok
(setq frame (if ediff-emacs-p frame-or-win (window-frame frame-or-win))
buf-name
(buffer-name (window-buffer (frame-selected-window frame)))))
(if (string-match "Minibuf" buf-name)
nil
frame)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-delete-temp-files ()
new version
1997-11-01 01:46:51 +00:00
(if (and (stringp ediff-temp-file-A) (file-exists-p ediff-temp-file-A))
Initial revision
1995-03-16 22:34:51 +00:00
(delete-file ediff-temp-file-A))
new version
1997-11-01 01:46:51 +00:00
(if (and (stringp ediff-temp-file-B) (file-exists-p ediff-temp-file-B))
Initial revision
1995-03-16 22:34:51 +00:00
(delete-file ediff-temp-file-B))
new version
1997-11-01 01:46:51 +00:00
(if (and (stringp ediff-temp-file-C) (file-exists-p ediff-temp-file-C))
Initial revision
1995-03-16 22:34:51 +00:00
(delete-file ediff-temp-file-C)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Kill control buffer, other auxiliary Ediff buffers.
;; Leave one of the frames split between buffers A/B/C
(defun ediff-cleanup-mess ()
*** empty log message ***
1999-11-01 07:16:15 +00:00
(let* ((buff-A ediff-buffer-A)
(buff-B ediff-buffer-B)
(buff-C ediff-buffer-C)
(ctl-buf ediff-control-buffer)
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
(ctl-wind (ediff-get-visible-buffer-window ctl-buf))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(ctl-frame ediff-control-frame)
(three-way-job ediff-3way-job)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(main-frame (cond ((window-live-p ediff-window-A)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(window-frame ediff-window-A))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
((window-live-p ediff-window-B)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(window-frame ediff-window-B)))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-kill-buffer-carefully ediff-diff-buffer)
(ediff-kill-buffer-carefully ediff-custom-diff-buffer)
(ediff-kill-buffer-carefully ediff-fine-diff-buffer)
(ediff-kill-buffer-carefully ediff-tmp-buffer)
(ediff-kill-buffer-carefully ediff-error-buffer)
(ediff-kill-buffer-carefully ediff-msg-buffer)
(ediff-kill-buffer-carefully ediff-debug-buffer)
new version
1997-05-31 01:10:39 +00:00
(if (boundp 'ediff-patch-diagnostics)
(ediff-kill-buffer-carefully ediff-patch-diagnostics))
Initial revision
1995-03-16 22:34:51 +00:00
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
;; delete control frame or window
(cond ((and (ediff-window-display-p) (frame-live-p ctl-frame))
(delete-frame ctl-frame))
((window-live-p ctl-wind)
(delete-window ctl-wind)))
*** empty log message ***
1996-12-28 02:53:04 +00:00
;; Hide bottom toolbar. --marcpa
(if (not (ediff-multiframe-setup-p))
(ediff-kill-bottom-toolbar))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-kill-buffer-carefully ctl-buf)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
(if (frame-live-p main-frame)
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
(select-frame main-frame))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; display only if not visible
(condition-case nil
(or (ediff-get-visible-buffer-window buff-B)
(switch-to-buffer buff-B))
(error))
(condition-case nil
(or (ediff-get-visible-buffer-window buff-A)
(progn
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 (and (ediff-get-visible-buffer-window buff-B)
(ediff-buffer-live-p buff-A))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(funcall ediff-split-window-function))
Initial revision
1995-03-16 22:34:51 +00:00
(switch-to-buffer buff-A)))
(error))
(if three-way-job
(condition-case nil
(or (ediff-get-visible-buffer-window buff-C)
(progn
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 (and (or (ediff-get-visible-buffer-window buff-A)
(ediff-get-visible-buffer-window buff-B))
(ediff-buffer-live-p buff-C))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(funcall ediff-split-window-function))
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
(switch-to-buffer buff-C)))
Initial revision
1995-03-16 22:34:51 +00:00
(error)))
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
(balance-windows)
Initial revision
1995-03-16 22:34:51 +00:00
(message "")
))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43: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
(defun ediff-janitor (ask keep-variants)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
"Kill buffers A, B, and, possibly, C, if these buffers aren't modified.
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
In merge jobs, buffer C is not deleted here, but rather according to
ediff-quit-merge-hook.
A side effect of cleaning up may be that you should be careful when comparing
the same buffer in two separate Ediff sessions: quitting one of them might
delete this buffer in another session as well."
(ediff-dispose-of-variant-according-to-user
ediff-buffer-A 'A ask keep-variants)
(ediff-dispose-of-variant-according-to-user
ediff-buffer-B 'B ask keep-variants)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if ediff-merge-job ; don't del buf C if merging--del ancestor buf instead
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-dispose-of-variant-according-to-user
ediff-ancestor-buffer 'Ancestor ask keep-variants)
(ediff-dispose-of-variant-according-to-user
ediff-buffer-C 'C ask keep-variants)
))
;; Kill the variant buffer, according to user directives (ask, kill
;; unconditionaly, keep)
;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor
(defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants)
;; if this is indirect buffer, kill it and substitute with direct buf
2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu> * viper-util.el (viper-read-key-sequence): fixed so it'll read fast key sequences in emacs native mode (viper-events-to-keys): deleted * viper.el (describe-key, describe-key-briefly): get rid of viper-events-to-keys. * ediff-init.el (ediff-has-gutter-support): Steven Turnbull's patch. * ediff-wind.el (ediff-setup-control-frame): Use ediff-has-gutter-support. * ediff-util.el (ediff-dispose-of-variant-according-to-user): check if buff is alive. * ediff.el: typo in comment.
2002-02-10 06:46:12 +00:00
(if (and (ediff-buffer-live-p buff)
(ediff-with-current-buffer buff ediff-temp-indirect-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
(let ((wind (ediff-get-visible-buffer-window buff))
(base (buffer-base-buffer buff))
(modified-p (buffer-modified-p buff)))
(if (and (window-live-p wind) (ediff-buffer-live-p base))
(set-window-buffer wind base))
;; Kill indirect buffer even if it is modified, because the base buffer
;; is still there. Note that if the base buffer is dead then so will be
;; the indirect buffer
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-with-current-buffer buff
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-buffer-modified-p nil))
(ediff-kill-buffer-carefully buff)
(ediff-with-current-buffer base
(set-buffer-modified-p modified-p)))
;; otherwise, ask or use the value of keep-variants
(or (not (ediff-buffer-live-p buff))
keep-variants
(buffer-modified-p buff)
(and ask
(not (y-or-n-p (format "Kill buffer %S [%s]? "
bufftype (buffer-name buff)))))
(ediff-kill-buffer-carefully buff))
))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
new version
1997-05-31 01:10:39 +00:00
(defun ediff-maybe-save-and-delete-merge (&optional save-and-continue)
*** empty log message ***
1996-09-20 01:10:05 +00:00
"Default hook to run on quitting a merge job.
new version
1997-05-31 01:10:39 +00:00
This can also be used to save merge buffer in the middle of an Ediff session.
If the optional SAVE-AND-CONTINUE argument is non-nil, save merge buffer and
*** empty log message ***
1999-11-01 07:16:15 +00:00
continue. Otherwise:
*** empty log message ***
1996-09-20 01:10:05 +00:00
If `ediff-autostore-merges' is nil, this does nothing.
If it is t, it saves the merge buffer in the file `ediff-merge-store-file'
*** empty log message ***
1999-11-01 07:16:15 +00:00
or asks the user, if the latter is nil. It then asks the user whether to
*** empty log message ***
1996-09-20 01:10:05 +00:00
delete the merge buffer.
If `ediff-autostore-merges' is neither nil nor t, the merge buffer is saved
only if this merge job is part of a group, i.e., was invoked from within
`ediff-merge-directories', `ediff-merge-directory-revisions', and such."
new version
1997-05-31 01:10:39 +00:00
(let ((merge-store-file ediff-merge-store-file)
(ediff-autostore-merges ; fake ediff-autostore-merges, if necessary
(if save-and-continue t ediff-autostore-merges)))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(if ediff-autostore-merges
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
(cond ((stringp merge-store-file)
*** empty log message ***
1996-09-20 01:10:05 +00:00
;; store, ask to delete
new version
1997-05-31 01:10:39 +00:00
(ediff-write-merge-buffer-and-maybe-kill
ediff-buffer-C merge-store-file 'show-file save-and-continue))
*** empty log message ***
1996-09-20 01:10:05 +00:00
((eq ediff-autostore-merges t)
;; ask for file name
(setq merge-store-file
new version
1997-05-31 01:10:39 +00:00
(read-file-name "Save the merge buffer in file: "))
(ediff-write-merge-buffer-and-maybe-kill
ediff-buffer-C merge-store-file nil save-and-continue))
*** empty log message ***
1996-12-28 02:53:04 +00:00
((and (ediff-buffer-live-p ediff-meta-buffer)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-meta-buffer
*** empty log message ***
1996-12-28 02:53:04 +00:00
(ediff-merge-metajob)))
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; The parent metajob passed nil as the autostore file.
nil)))
*** empty log message ***
1996-09-20 01:10:05 +00:00
))
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; write merge buffer. If the optional argument save-and-continue is non-nil,
new version
1997-05-31 01:10:39 +00:00
;; then don't kill the merge buffer
(defun ediff-write-merge-buffer-and-maybe-kill (buf file
&optional
show-file save-and-continue)
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 (not (eq (find-buffer-visiting file) buf))
(let ((warn-message
(format "Another buffer is visiting file %s. Too dangerous to save the merge buffer"
file)))
(beep)
(message warn-message)
(with-output-to-temp-buffer ediff-msg-buffer
(princ "\n\n")
(princ warn-message)
(princ "\n\n")
)
(sit-for 2))
(ediff-with-current-buffer buf
(if (or (not (file-exists-p file))
(y-or-n-p (format "File %s exists, overwrite? " file)))
(progn
;;(write-region (point-min) (point-max) file)
(ediff-with-current-buffer buf
(set-visited-file-name file)
(save-buffer))
(if show-file
(progn
(message "Merge buffer saved in: %s" file)
(set-buffer-modified-p nil)
(sit-for 3)))
(if (and
(not save-and-continue)
(y-or-n-p "Merge buffer saved. Now kill the buffer? "))
(ediff-kill-buffer-carefully buf)))))
))
*** empty log message ***
1996-09-20 01:10:05 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; The default way of suspending Ediff.
;; Buries Ediff buffers, kills all windows.
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-default-suspend-function ()
Initial revision
1995-03-16 22:34:51 +00:00
(let* ((buf-A ediff-buffer-A)
(buf-B ediff-buffer-B)
(buf-C ediff-buffer-C)
(buf-A-wind (ediff-get-visible-buffer-window buf-A))
(buf-B-wind (ediff-get-visible-buffer-window buf-B))
(buf-C-wind (ediff-get-visible-buffer-window buf-C))
new version
1997-05-31 01:10:39 +00:00
(buf-patch (if (boundp 'ediff-patchbufer) ediff-patchbufer nil))
(buf-patch-diag (if (boundp 'ediff-patch-diagnostics)
ediff-patch-diagnostics nil))
Initial revision
1995-03-16 22:34:51 +00:00
(buf-err ediff-error-buffer)
(buf-diff ediff-diff-buffer)
(buf-custom-diff ediff-custom-diff-buffer)
(buf-fine-diff ediff-fine-diff-buffer))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; hide the control panel
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
(iconify-frame ediff-control-frame)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(bury-buffer))
Initial revision
1995-03-16 22:34:51 +00:00
(if buf-err (bury-buffer buf-err))
(if buf-diff (bury-buffer buf-diff))
(if buf-custom-diff (bury-buffer buf-custom-diff))
(if buf-fine-diff (bury-buffer buf-fine-diff))
(if buf-patch (bury-buffer buf-patch))
(if buf-patch-diag (bury-buffer buf-patch-diag))
(if (window-live-p buf-A-wind)
(progn
(select-window buf-A-wind)
(delete-other-windows)
(bury-buffer))
new version
1997-05-31 01:10:39 +00:00
(if (ediff-buffer-live-p buf-A)
(progn
(set-buffer buf-A)
(bury-buffer))))
Initial revision
1995-03-16 22:34:51 +00:00
(if (window-live-p buf-B-wind)
(progn
(select-window buf-B-wind)
(delete-other-windows)
(bury-buffer))
new version
1997-05-31 01:10:39 +00:00
(if (ediff-buffer-live-p buf-B)
(progn
(set-buffer buf-B)
(bury-buffer))))
Initial revision
1995-03-16 22:34:51 +00:00
(if (window-live-p buf-C-wind)
(progn
(select-window buf-C-wind)
(delete-other-windows)
(bury-buffer))
new version
1997-05-31 01:10:39 +00:00
(if (ediff-buffer-live-p buf-C)
(progn
(set-buffer buf-C)
(bury-buffer))))
Initial revision
1995-03-16 22:34:51 +00:00
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-suspend ()
"Suspend Ediff.
To resume, switch to the appropriate `Ediff Control Panel'
buffer and then type \\[ediff-recenter]. Ediff will automatically set
up an appropriate window config."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
(run-hooks 'ediff-suspend-hook)
Initial revision
1995-03-16 22:34:51 +00:00
(message
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
"To resume, type M-x eregistry and select the desired Ediff session"))
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-status-info ()
"Show the names of the buffers or files being operated on by Ediff.
Hit \\[ediff-recenter] to reset the windows afterward."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
(save-excursion
(ediff-skip-unsuitable-frames))
*** empty log message ***
1996-06-22 01:54:34 +00:00
(with-output-to-temp-buffer ediff-msg-buffer
(ediff-status-info, ediff-debug-info): Put temp buffer into fundamental mode. (ediff-set-difference): Use copy-sequence if available.
2000-11-10 22:35:35 +00:00
(ediff-with-current-buffer standard-output
(fundamental-mode))
*** empty log message ***
1996-06-22 01:54:34 +00:00
(raise-frame (selected-frame))
Initial revision
1995-03-16 22:34:51 +00:00
(princ (ediff-version))
(princ "\n\n")
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-A
Initial revision
1995-03-16 22:34:51 +00:00
(if buffer-file-name
(princ
(format "File A = %S\n" buffer-file-name))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(princ
Initial revision
1995-03-16 22:34:51 +00:00
(format "Buffer A = %S\n" (buffer-name)))))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-B
Initial revision
1995-03-16 22:34:51 +00:00
(if buffer-file-name
(princ
(format "File B = %S\n" buffer-file-name))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(princ
Initial revision
1995-03-16 22:34:51 +00:00
(format "Buffer B = %S\n" (buffer-name)))))
(if ediff-3way-job
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
Initial revision
1995-03-16 22:34:51 +00:00
(if buffer-file-name
(princ
(format "File C = %S\n" buffer-file-name))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(princ
Initial revision
1995-03-16 22:34:51 +00:00
(format "Buffer C = %S\n" (buffer-name))))))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(princ (format "Customized diff output %s\n"
(if (ediff-buffer-live-p ediff-custom-diff-buffer)
(concat "\tin buffer "
(buffer-name ediff-custom-diff-buffer))
new version
1997-05-31 01:10:39 +00:00
" is not available")))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(princ (format "Plain diff output %s\n"
(if (ediff-buffer-live-p ediff-diff-buffer)
(concat "\tin buffer "
(buffer-name ediff-diff-buffer))
new version
1997-05-31 01:10:39 +00:00
" is not available")))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(let* ((A-line (ediff-with-current-buffer ediff-buffer-A
Initial revision
1995-03-16 22:34:51 +00:00
(1+ (count-lines (point-min) (point)))))
new version
1997-07-31 04:04:23 +00:00
(B-line (ediff-with-current-buffer ediff-buffer-B
Initial revision
1995-03-16 22:34:51 +00:00
(1+ (count-lines (point-min) (point)))))
C-line)
(princ (format "\Buffer A's point is on line %d\n" A-line))
(princ (format "Buffer B's point is on line %d\n" B-line))
(if ediff-3way-job
(progn
new version
1997-07-31 04:04:23 +00:00
(setq C-line (ediff-with-current-buffer ediff-buffer-C
Initial revision
1995-03-16 22:34:51 +00:00
(1+ (count-lines (point-min) (point)))))
(princ (format "Buffer C's point is on line %d\n" C-line)))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(princ (format "\nCurrent difference number = %S\n"
(cond ((< ediff-current-difference 0) 'start)
((>= ediff-current-difference
ediff-number-of-differences) 'end)
(t (1+ ediff-current-difference)))))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(princ
new version
1997-05-31 01:10:39 +00:00
(format "\n%s regions that differ in white space & line breaks only"
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if ediff-ignore-similar-regions
new version
1997-05-31 01:10:39 +00:00
"Ignoring" "Showing")))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(if (and ediff-merge-job ediff-show-clashes-only)
(princ
"\nFocusing on regions where both buffers differ from the ancestor"))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job)
(princ
"\nSkipping merge regions that differ from default setting"))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(princ "\nSelective browsing by regexp is off\n"))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
((eq ediff-skip-diff-region-function
ediff-hide-regexp-matches-function)
Initial revision
1995-03-16 22:34:51 +00:00
(princ
"\nIgnoring regions that match")
(princ
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(format
Initial revision
1995-03-16 22:34:51 +00:00
"\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n"
ediff-regexp-hide-A ediff-hide-regexp-connective
ediff-regexp-hide-B)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
((eq ediff-skip-diff-region-function
ediff-focus-on-regexp-matches-function)
Initial revision
1995-03-16 22:34:51 +00:00
(princ
"\nFocusing on regions that match")
(princ
(format
"\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n"
ediff-regexp-focus-A ediff-focus-regexp-connective
ediff-regexp-focus-B)))
(t (princ "\nSelective browsing via a user-defined method.\n")))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(princ
(format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
(substitute-command-keys "\\[ediff-submit-report]")))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
) ; with output
(if (frame-live-p ediff-control-frame)
(ediff-reset-mouse ediff-control-frame))
(if (window-live-p ediff-control-window)
(select-window ediff-control-window)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;;; Support routines
;; Select a difference by placing the ASCII flags around the appropriate
;; group of lines in the A, B buffers
;; This may have to be modified for buffer C, when it will be supported.
(defun ediff-select-difference (n)
(if (and (ediff-buffer-live-p ediff-buffer-A)
(ediff-buffer-live-p ediff-buffer-B)
(ediff-valid-difference-p n))
(progn
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(cond
((and (ediff-has-face-support-p) ediff-use-faces)
(ediff-highlight-diff n))
((eq ediff-highlighting-style 'ascii)
(ediff-place-flags-in-buffer
'A ediff-buffer-A ediff-control-buffer n)
(ediff-place-flags-in-buffer
'B ediff-buffer-B ediff-control-buffer n)
(if ediff-3way-job
(ediff-place-flags-in-buffer
'C ediff-buffer-C ediff-control-buffer n))
(if (ediff-buffer-live-p ediff-ancestor-buffer)
(ediff-place-flags-in-buffer
'Ancestor ediff-ancestor-buffer
ediff-control-buffer n))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-install-fine-diff-if-necessary n)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-select-hook))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Unselect a difference by removing the ASCII flags in the buffers.
;; This may have to be modified for buffer C, when it will be supported.
(defun ediff-unselect-difference (n)
(if (ediff-valid-difference-p n)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(progn
*** empty log message ***
1996-02-16 06:36:35 +00:00
(cond ((and (ediff-has-face-support-p) ediff-use-faces)
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-unhighlight-diff))
((eq ediff-highlighting-style 'ascii)
(ediff-remove-flags-from-buffer
ediff-buffer-A
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-get-diff-overlay n 'A))
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-remove-flags-from-buffer
ediff-buffer-B
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-get-diff-overlay n 'B))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-3way-job
(ediff-remove-flags-from-buffer
ediff-buffer-C
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-get-diff-overlay n 'C)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (ediff-buffer-live-p ediff-ancestor-buffer)
(ediff-remove-flags-from-buffer
ediff-ancestor-buffer
(ediff-get-diff-overlay n 'Ancestor)))
Initial revision
1995-03-16 22:34:51 +00:00
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; unhighlight fine diffs
(ediff-set-fine-diff-properties ediff-current-difference 'default)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-unselect-hook))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Unselects prev diff and selects a new one, if FLAG has value other than
;; 'select-only or 'unselect-only. If FLAG is 'select-only, the
;; next difference is selected, but the current selection is not
;; unselected. If FLAG is 'unselect-only then the current selection is
;; unselected, but the next one is not selected. If NO-RECENTER is non-nil,
;; don't recenter buffers after selecting/unselecting.
(defun ediff-unselect-and-select-difference (n &optional flag no-recenter)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((ediff-current-difference n))
(or no-recenter
(ediff-recenter 'no-rehighlight)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((control-buf ediff-control-buffer))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(unwind-protect
Initial revision
1995-03-16 22:34:51 +00:00
(progn
(or (eq flag 'select-only)
(ediff-unselect-difference ediff-current-difference))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(or (eq flag 'unselect-only)
(ediff-select-difference n))
(setq ediff-current-difference n)
) ; end protected section
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)))
))
Initial revision
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
(defun ediff-highlight-diff-in-one-buffer (n buf-type)
(if (ediff-buffer-live-p (ediff-get-buffer buf-type))
(let* ((buff (ediff-get-buffer buf-type))
(last (ediff-with-current-buffer buff (point-max)))
(begin (ediff-get-diff-posn buf-type 'beg n))
(end (ediff-get-diff-posn buf-type 'end n))
(xtra (if (equal begin end) 1 0))
(end-hilit (min last (+ end xtra)))
(current-diff-overlay
(symbol-value
(ediff-get-symbol-from-alist
buf-type ediff-current-diff-overlay-alist))))
(if ediff-xemacs-p
(ediff-move-overlay current-diff-overlay begin end-hilit)
(ediff-move-overlay current-diff-overlay begin end-hilit buff))
(ediff-overlay-put current-diff-overlay 'priority
(ediff-highest-priority begin end-hilit buff))
(ediff-overlay-put current-diff-overlay 'ediff-diff-num n)
;; unhighlight the background overlay for diff n so it won't
;; interfere with the current diff overlay
(ediff-set-overlay-face (ediff-get-diff-overlay n buf-type) nil)
)))
(defun ediff-unhighlight-diff-in-one-buffer (buf-type)
(if (ediff-buffer-live-p (ediff-get-buffer buf-type))
(let ((current-diff-overlay
(symbol-value
(ediff-get-symbol-from-alist
buf-type ediff-current-diff-overlay-alist)))
(overlay
(ediff-get-diff-overlay ediff-current-difference buf-type))
)
(ediff-move-overlay current-diff-overlay 1 1)
;; rehighlight the overlay in the background of the
;; current difference region
(ediff-set-overlay-face
overlay
(if (and (ediff-has-face-support-p)
ediff-use-faces ediff-highlight-all-diffs)
(ediff-background-face buf-type ediff-current-difference)))
)))
(defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type)
(ediff-unselect-and-select-difference -1)
(if (and (ediff-has-face-support-p) ediff-use-faces)
(let* ((inhibit-quit t)
(current-diff-overlay-var
(ediff-get-symbol-from-alist
buf-type ediff-current-diff-overlay-alist))
(current-diff-overlay (symbol-value current-diff-overlay-var)))
(ediff-paint-background-regions 'unhighlight)
(if (ediff-overlayp current-diff-overlay)
(ediff-delete-overlay current-diff-overlay))
(set current-diff-overlay-var nil)
)))
(defsubst ediff-highlight-diff (n)
"Put face on diff N. Invoked for X displays only."
(ediff-highlight-diff-in-one-buffer n 'A)
(ediff-highlight-diff-in-one-buffer n 'B)
(ediff-highlight-diff-in-one-buffer n 'C)
(ediff-highlight-diff-in-one-buffer n 'Ancestor)
)
(defsubst ediff-unhighlight-diff ()
"Remove overlays from buffers A, B, and C."
(ediff-unhighlight-diff-in-one-buffer 'A)
(ediff-unhighlight-diff-in-one-buffer 'B)
(ediff-unhighlight-diff-in-one-buffer 'C)
(ediff-unhighlight-diff-in-one-buffer 'Ancestor)
)
;; delete highlighting overlays, restore faces to their original form
(defsubst ediff-unhighlight-diffs-totally ()
(ediff-unhighlight-diffs-totally-in-one-buffer 'A)
(ediff-unhighlight-diffs-totally-in-one-buffer 'B)
(ediff-unhighlight-diffs-totally-in-one-buffer 'C)
(ediff-unhighlight-diffs-totally-in-one-buffer 'Ancestor)
)
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; This is adapted from a similar function in `emerge.el'.
;; PROMPT should not have a trailing ': ', so that it can be modified
;; according to context.
;; If DEFAULT-FILE is set, it should be used as the default value.
;; If DEFAULT-DIR is non-nil, use it as the default directory.
;; Otherwise, use the value of Emacs' variable `default-directory.'
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-read-file-name (prompt default-dir default-file &optional no-dirs)
Initial revision
1995-03-16 22:34:51 +00:00
;; hack default-dir if it is not set
(setq default-dir
(file-name-as-directory
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-abbreviate-file-name
Initial revision
1995-03-16 22:34:51 +00:00
(expand-file-name (or default-dir
(and default-file
(file-name-directory default-file))
default-directory)))))
;; strip the directory from default-file
(if default-file
(setq default-file (file-name-nondirectory default-file)))
(if (string= default-file "")
(setq default-file nil))
(let (f)
(setq f (expand-file-name
(read-file-name
*** empty log message ***
1996-06-22 01:54:34 +00:00
(format "%s%s "
Initial revision
1995-03-16 22:34:51 +00:00
prompt
*** empty log message ***
1996-06-22 01:54:34 +00:00
(cond (default-file
(concat " (default " default-file "):"))
(t (concat " (default " default-dir "):"))))
Initial revision
1995-03-16 22:34:51 +00:00
default-dir
*** empty log message ***
1996-06-22 01:54:34 +00:00
(or default-file default-dir)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
t ; must match, no-confirm
Initial revision
1995-03-16 22:34:51 +00:00
(if default-file (file-name-directory default-file))
)
default-dir
))
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 user entered a directory name, expand the default file in that
Initial revision
1995-03-16 22:34:51 +00:00
;; directory. This allows the user to enter a directory name for the
;; B-file and diff against the default-file in that directory instead
;; of a DIRED listing!
(if (and (file-directory-p f) default-file)
(setq f (expand-file-name
(file-name-nondirectory default-file) f)))
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 (and no-dirs (file-directory-p f))
(error "File %s is a directory" f))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
f))
*** empty log message ***
1996-02-16 06:36:35 +00:00
;; If PREFIX is given, then it is used as a prefix for the temp file
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; name. Otherwise, `ediff' is used. If FILE is given, use this
Initial revision
1995-03-16 22:34:51 +00:00
;; file and don't create a new one.
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; In MS-DOS, make sure the prefix isn't too long, or else
(ediff-make-temp-file): Run the prefix through convert-standard-file-name, but leave the results of make-temp-name unaltered. For MS-DOS, truncate the prefix to 2 characters if the original name already exists, or has a special handler.
1998-11-10 11:26:34 +00:00
;; `make-temp-name' isn't guaranteed to return a unique filename.
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; Also, save buffer from START to END in the file.
;; START defaults to (point-min), END to (point-max)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-make-temp-file (buff &optional prefix given-file start end)
(ediff-make-temp-file): Run the prefix through convert-standard-file-name, but leave the results of make-temp-name unaltered. For MS-DOS, truncate the prefix to 2 characters if the original name already exists, or has a special handler.
1998-11-10 11:26:34 +00:00
(let* ((p (ediff-convert-standard-filename (or prefix "ediff")))
(short-p p)
* 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
(coding-system-for-write ediff-coding-system-for-write)
(ediff-make-temp-file): Run the prefix through convert-standard-file-name, but leave the results of make-temp-name unaltered. For MS-DOS, truncate the prefix to 2 characters if the original name already exists, or has a special handler.
1998-11-10 11:26:34 +00:00
f short-f)
(if (and (fboundp 'msdos-long-file-names)
(not (msdos-long-file-names))
(> (length p) 2))
(setq short-p (substring p 0 2)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
(setq f (concat ediff-temp-file-prefix p)
(ediff-make-temp-file): Run the prefix through convert-standard-file-name, but leave the results of make-temp-name unaltered. For MS-DOS, truncate the prefix to 2 characters if the original name already exists, or has a special handler.
1998-11-10 11:26:34 +00:00
short-f (concat ediff-temp-file-prefix short-p)
*** empty log message ***
1999-11-01 07:16:15 +00:00
f (cond (given-file)
*** empty log message ***
1996-02-16 06:36:35 +00:00
((find-file-name-handler f 'find-file-noselect)
;; to thwart file handlers in write-region, e.g., if file
;; name ends with .Z or .gz
;; This is needed so that patches produced by ediff will
;; have more meaningful names
*** empty log message ***
1999-11-01 07:16:15 +00:00
(ediff-make-empty-tmp-file short-f))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(prefix
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; Prefix is most often the same as the file name for the
;; variant. Here we are trying to use the original file
;; name but in the temp directory.
(ediff-make-empty-tmp-file f 'keep-name))
(t
;; If don't care about name, add some random stuff
;; to proposed file name.
(ediff-make-empty-tmp-file short-f))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; create the file
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buff
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(write-region (if start start (point-min))
(if end end (point-max))
f
nil ; don't append---erase
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
'no-message)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(set-file-modes f ediff-temp-file-mode)
(ediff-make-temp-file): Run the prefix through convert-standard-file-name, but leave the results of make-temp-name unaltered. For MS-DOS, truncate the prefix to 2 characters if the original name already exists, or has a special handler.
1998-11-10 11:26:34 +00:00
(expand-file-name f))))
Initial revision
1995-03-16 22:34:51 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; Create a temporary file.
;; The returned file name (created by appending some random characters at the
;; end of PROPOSED-NAME is guaranteed to point to a newly created empty file.
;; This is a replacement for make-temp-name, which eliminates a security hole.
;; If KEEP-PROPOSED-NAME isn't nil, try to keep PROPOSED-NAME, unless such file
;; already exists.
;; It is a modified version of make-temp-file in emacs 20.5
(defun ediff-make-empty-tmp-file (proposed-name &optional keep-proposed-name)
(let ((file proposed-name))
(while (condition-case ()
(progn
(if (or (file-exists-p file) (not keep-proposed-name))
(setq file (make-temp-name proposed-name)))
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 with-temp-buffer thing is a workaround for an XEmacs
;; bug: write-region complains that we are trying to visit a
;; file in an indirect buffer, failing to notice that the
;; VISIT flag is unset and that we are actually writing from a
;; string and not from any buffer.
(with-temp-buffer
(write-region "" nil file nil 'silent nil 'excl))
*** empty log message ***
1999-11-01 07:16:15 +00:00
nil)
(file-already-exists t))
;; the file was somehow created by someone else between
;; `make-temp-name' and `write-region', let's try again.
nil)
file))
Initial revision
1995-03-16 22:34:51 +00:00
;; Quote metacharacters (using \) when executing diff in Unix, but not in
;; EMX OS/2
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
;;(defun ediff-protect-metachars (str)
;; (or (memq system-type '(emx vax-vms axp-vms))
;; (let ((limit 0))
;; (while (string-match ediff-metachars str limit)
;; (setq str (concat (substring str 0 (match-beginning 0))
;; "\\"
;; (substring str (match-beginning 0))))
;; (setq limit (1+ (match-end 0))))))
;; str)
Initial revision
1995-03-16 22:34:51 +00:00
;; Make sure the current buffer (for a file) has the same contents as the
;; file on disk, and attempt to remedy the situation if not.
;; Signal an error if we can't make them the same, or the user doesn't want
;; to do what is necessary to make them the same.
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; Also, Ediff always offers to revert obsolete buffers, whether they
Initial revision
1995-03-16 22:34:51 +00:00
;; are modified or not.
(defun ediff-verify-file-buffer (&optional file-magic)
;; First check if the file has been modified since the buffer visited it.
(if (verify-visited-file-modtime (current-buffer))
(if (buffer-modified-p)
;; If buffer is not obsolete and is modified, offer to save
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(if (yes-or-no-p
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
(format "Buffer %s has been modified. Save it in file %s? "
(buffer-name)
Initial revision
1995-03-16 22:34:51 +00:00
buffer-file-name))
*** empty log message ***
1996-06-22 01:54:34 +00:00
(condition-case nil
Initial revision
1995-03-16 22:34:51 +00:00
(save-buffer)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(error
(beep)
(message "Couldn't save %s" buffer-file-name)))
(error "Buffer is out of sync for file %s" buffer-file-name))
Initial revision
1995-03-16 22:34:51 +00:00
;; If buffer is not obsolete and is not modified, do nothing
nil)
;; If buffer is obsolete, offer to revert
(if (yes-or-no-p
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
(format "File %s was modified since visited by buffer %s. REVERT file %s? "
buffer-file-name
(buffer-name)
Initial revision
1995-03-16 22:34:51 +00:00
buffer-file-name))
(progn
(if file-magic
(erase-buffer))
(revert-buffer t t))
(error "Buffer out of sync for file %s" buffer-file-name))))
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 there is another buffer visiting the file of the merge buffer, offer to
;; save and delete the buffer; else bark
(defun ediff-verify-file-merge-buffer (file)
(let ((buff (if (stringp file) (find-buffer-visiting file)))
warn-message)
(or (null buff)
(progn
(setq warn-message
(format "Buffer %s is visiting %s. Save and kill the buffer? "
(buffer-name buff) file))
(with-output-to-temp-buffer ediff-msg-buffer
(princ "\n\n")
(princ warn-message)
(princ "\n\n"))
(if (y-or-n-p
(message warn-message))
(with-current-buffer buff
(save-buffer)
(kill-buffer (current-buffer)))
(error "Too dangerous to merge versions of a file visited by another buffer"))))
))
Initial revision
1995-03-16 22:34:51 +00:00
new version
1997-09-06 04:16:05 +00:00
(defun ediff-filename-magic-p (file)
(or (ediff-file-compressed-p file)
(ediff-file-remote-p file)))
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-save-buffer (arg)
"Safe way of saving buffers A, B, C, and the diff output.
`wa' saves buffer A, `wb' saves buffer B, `wc' saves buffer C,
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
and `wd' saves the diff output.
With prefix argument, `wd' saves plain diff output.
Without an argument, it saves customized diff argument, if available
\(and plain output, if customized output was not generated\)."
Initial revision
1995-03-16 22:34:51 +00:00
(interactive "P")
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
(ediff-compute-custom-diffs-maybe)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(cond ((memq last-command-char '(?a ?b ?c))
(ediff-get-buffer
(ediff-char-to-buftype last-command-char)))
((eq last-command-char ?d)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(message "Saving diff output ...")
(sit-for 1) ; let the user see the message
(cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
ediff-diff-buffer)
((ediff-buffer-live-p ediff-custom-diff-buffer)
ediff-custom-diff-buffer)
((ediff-buffer-live-p ediff-diff-buffer)
ediff-diff-buffer)
(t (error "Output from `diff' not found"))))
)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(save-buffer)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
;; idea suggested by Hannu Koivisto <azure@iki.fi>
(defun ediff-clone-buffer-for-region-comparison (buff region-name)
(let ((cloned-buff (ediff-make-cloned-buffer buff region-name))
(pop-up-windows t)
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
wind
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
other-wind
msg-buf)
(ediff-with-current-buffer cloned-buff
(setq ediff-temp-indirect-buffer t))
(pop-to-buffer cloned-buff)
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
(setq wind (ediff-get-visible-buffer-window cloned-buff))
(select-window wind)
(delete-other-windows)
(split-window-vertically)
(ediff-select-lowest-window)
(setq other-wind (selected-window))
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(with-temp-buffer
(erase-buffer)
(insert
(format "\n ******* Mark a region in buffer %s *******\n"
(buffer-name cloned-buff)))
(insert
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
(ediff-with-current-buffer buff
(format "\n\t When done, type %s Use %s to abort\n "
(ediff-format-bindings-of 'exit-recursive-edit)
(ediff-format-bindings-of 'abort-recursive-edit))))
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(goto-char (point-min))
(setq msg-buf (current-buffer))
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
(set-window-buffer other-wind msg-buf)
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(shrink-window-if-larger-than-buffer)
(if (window-live-p wind)
(select-window wind))
(condition-case nil
(recursive-edit)
(quit
(ediff-kill-buffer-carefully cloned-buff)))
)
cloned-buff))
(defun ediff-clone-buffer-for-window-comparison (buff wind region-name)
(let ((cloned-buff (ediff-make-cloned-buffer buff region-name)))
(ediff-with-current-buffer cloned-buff
(setq ediff-temp-indirect-buffer t))
(set-window-buffer wind cloned-buff)
cloned-buff))
(defun ediff-clone-buffer-for-current-diff-comparison (buff buf-type reg-name)
(let ((cloned-buff (ediff-make-cloned-buffer buff reg-name))
(reg-start (ediff-get-diff-posn buf-type 'beg))
(reg-end (ediff-get-diff-posn buf-type 'end)))
(ediff-with-current-buffer cloned-buff
;; set region to be the current diff region
(goto-char reg-start)
(set-mark reg-end)
(setq ediff-temp-indirect-buffer t))
cloned-buff))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(defun ediff-make-cloned-buffer (buff region-name)
(ediff-make-indirect-buffer
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. (ex-g-marks): New variable. (ex-print): New function. (ex-print-display-lines): New function. * viper.el (viper-set-hooks): add window-setup-hook, which sets the cursor color. * ediff-util.el (ediff-cleanup-mess): delete ctl window on exit when the window is not in its own frame. (ediff-clone-buffer-for-region-comparison): more robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): use generate-new-buffer-name. (ediff-inferior-compare-regions): deleted unused vars ctl-buf and quit-now.
2002-04-16 05:49:11 +00:00
buff (generate-new-buffer-name
(concat (if (stringp buff) buff (buffer-name buff)) region-name))
))
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(defun ediff-make-indirect-buffer (base-buf indirect-buf-name)
(ediff-cond-compile-for-xemacs-or-emacs
(make-indirect-buffer base-buf indirect-buf-name) ; xemacs
(make-indirect-buffer base-buf indirect-buf-name 'clone) ; emacs
))
* ediff-init.el: comments. * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
2002-03-05 05:34:19 +00:00
;; This function operates only from an ediff control buffer
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-compute-custom-diffs-maybe ()
*** empty log message ***
1996-02-16 06:36:35 +00:00
(let ((buf-A-file-name (buffer-file-name ediff-buffer-A))
(buf-B-file-name (buffer-file-name ediff-buffer-B))
file-A file-B)
(if (stringp buf-A-file-name)
(setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
(if (stringp buf-B-file-name)
(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
(setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name)
file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
(or (ediff-buffer-live-p ediff-custom-diff-buffer)
(setq ediff-custom-diff-buffer
(get-buffer-create
(ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
* ediff-init.el: comments. * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
2002-03-05 05:34:19 +00:00
(ediff-with-current-buffer ediff-custom-diff-buffer
(setq buffer-read-only nil)
(erase-buffer))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(ediff-exec-process
ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize
ediff-custom-diff-options file-A file-B)
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu> * ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks for remote files. (ediff-coding-system-for-read): replaced the no-conversion default with raw-text. * ediff-init.el: Removed :version from defcustom vars. * ediff-util.el (ediff-compute-custom-diffs-maybe): Better handling of the diff mode * ediff.texi: Added ediff-coding-system-for-read. * viper.texi: typos
2001-02-12 08:47:13 +00:00
;; put the diff file in diff-mode, if it is available
(if (fboundp 'diff-mode)
(with-current-buffer ediff-custom-diff-buffer
(diff-mode)))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(delete-file file-A)
(delete-file file-B)
))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(defun ediff-show-diff-output (arg)
(interactive "P")
(ediff-barf-if-not-control-buffer)
(ediff-compute-custom-diffs-maybe)
(save-excursion
(ediff-skip-unsuitable-frames ' ok-unsplittable))
(let ((buf (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer))
ediff-diff-buffer)
((ediff-buffer-live-p ediff-custom-diff-buffer)
ediff-custom-diff-buffer)
((ediff-buffer-live-p ediff-diff-buffer)
ediff-diff-buffer)
(t
(beep)
(message "Output from `diff' not found")
nil))))
(if buf
(progn
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buf
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(goto-char (point-min)))
(switch-to-buffer buf)
(raise-frame (selected-frame)))))
(if (frame-live-p ediff-control-frame)
(ediff-reset-mouse ediff-control-frame))
(if (window-live-p ediff-control-window)
(select-window ediff-control-window)))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(defun ediff-inferior-compare-regions ()
"Compare regions in an active Ediff session.
Like ediff-regions-linewise but is called from under an active Ediff session on
the files that belong to that session.
After quitting the session invoked via this function, type C-l to the parent
Ediff Control Panel to restore highlighting."
(interactive)
(let ((answer "")
(possibilities (list ?A ?B ?C))
*** empty log message ***
1996-12-28 02:53:04 +00:00
(zmacs-regions t)
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
use-current-diff-p
*** empty log message ***
1996-09-20 01:10:05 +00:00
begA begB endA endB bufA bufB)
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(if (ediff-valid-difference-p ediff-current-difference)
(progn
(ediff-set-fine-diff-properties ediff-current-difference 'default)
(ediff-unhighlight-diff)))
(ediff-paint-background-regions 'unhighlight)
*** empty log message ***
1996-09-20 01:10:05 +00:00
(cond ((ediff-merge-job)
(setq bufB ediff-buffer-C)
* ediff-init.el: comments. * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
2002-03-05 05:34:19 +00:00
;; ask which buffer to compare to the merge buffer
new version
1997-05-31 01:10:39 +00:00
(while (cond ((eq answer ?A)
(setq bufA ediff-buffer-A
possibilities '(?B))
*** empty log message ***
1996-09-20 01:10:05 +00:00
nil)
new version
1997-05-31 01:10:39 +00:00
((eq answer ?B)
(setq bufA ediff-buffer-B
possibilities '(?A))
*** empty log message ***
1996-09-20 01:10:05 +00:00
nil)
((equal answer ""))
(t (beep 1)
*** empty log message ***
1996-12-28 02:53:04 +00:00
(message "Valid values are A or B")
*** empty log message ***
1996-09-20 01:10:05 +00:00
(sit-for 2)
t))
(let ((cursor-in-echo-area t))
* ediff-init.el: comments. * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
2002-03-05 05:34:19 +00:00
(message
"Which buffer to compare to the merge buffer (A or B)? ")
new version
1997-05-31 01:10:39 +00:00
(setq answer (capitalize (read-char-exclusive))))))
*** empty log message ***
1996-09-20 01:10:05 +00:00
((ediff-3way-comparison-job)
* ediff-init.el: comments. * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
2002-03-05 05:34:19 +00:00
;; ask which two buffers to compare
*** empty log message ***
1996-09-20 01:10:05 +00:00
(while (cond ((memq answer possibilities)
(setq possibilities (delq answer possibilities))
(setq bufA
(eval
new version
1997-07-31 04:04:23 +00:00
(ediff-get-symbol-from-alist
answer ediff-buffer-alist)))
*** empty log message ***
1996-09-20 01:10:05 +00:00
nil)
((equal answer ""))
(t (beep 1)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(message
*** empty log message ***
1996-12-28 02:53:04 +00:00
"Valid values are %s"
*** empty log message ***
1996-09-20 01:10:05 +00:00
(mapconcat 'char-to-string possibilities " or "))
(sit-for 2)
t))
(let ((cursor-in-echo-area t))
(message "Enter the 1st buffer you want to compare (%s): "
* ediff-init.el: comments. * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
2002-03-05 05:34:19 +00:00
(mapconcat 'char-to-string possibilities " or "))
*** empty log message ***
1996-09-20 01:10:05 +00:00
(setq answer (capitalize (read-char-exclusive)))))
(setq answer "") ; silence error msg
(while (cond ((memq answer possibilities)
(setq possibilities (delq answer possibilities))
(setq bufB
(eval
new version
1997-07-31 04:04:23 +00:00
(ediff-get-symbol-from-alist
answer ediff-buffer-alist)))
*** empty log message ***
1996-09-20 01:10:05 +00:00
nil)
((equal answer ""))
(t (beep 1)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(message
*** empty log message ***
1996-12-28 02:53:04 +00:00
"Valid values are %s"
*** empty log message ***
1996-09-20 01:10:05 +00:00
(mapconcat 'char-to-string possibilities " or "))
(sit-for 2)
t))
(let ((cursor-in-echo-area t))
(message "Enter the 2nd buffer you want to compare (%s): "
(mapconcat 'char-to-string possibilities "/"))
(setq answer (capitalize (read-char-exclusive))))))
(t ; 2way comparison
(setq bufA ediff-buffer-A
new version
1997-05-31 01:10:39 +00:00
bufB ediff-buffer-B
possibilities nil)))
*** empty log message ***
1996-09-20 01:10:05 +00:00
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(if (and (ediff-valid-difference-p ediff-current-difference)
(y-or-n-p "Compare currently highlighted difference regions? "))
(setq use-current-diff-p t))
(setq bufA (if use-current-diff-p
(ediff-clone-buffer-for-current-diff-comparison
bufA 'A "-Region.A-")
(ediff-clone-buffer-for-region-comparison bufA "-Region.A-")))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer bufA
*** empty log message ***
1996-09-20 01:10:05 +00:00
(setq begA (region-beginning)
endA (region-end))
(goto-char begA)
(beginning-of-line)
(setq begA (point))
(goto-char endA)
(end-of-line)
(or (eobp) (forward-char)) ; include the newline char
(setq endA (point)))
* ediff-init.el: comments. * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories, ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): cleanup. (ediff-draw-dir-diffs): now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): new function that implements copying of files from one Ediff dir to another (ediff-bury-dir-diffs-buffer): kills the buffer instead. (ediff-append-custom-diff): better error msgs. * ediff-util.el (ediff-compute-custom-diffs-maybe): buglet fix. (ediff-inferior-compare-regions): Use ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface.
2002-03-05 05:34:19 +00:00
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
(setq bufB (if use-current-diff-p
(ediff-clone-buffer-for-current-diff-comparison
bufB 'B "-Region.B-")
(ediff-clone-buffer-for-region-comparison bufB "-Region.B-")))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer bufB
*** empty log message ***
1996-09-20 01:10:05 +00:00
(setq begB (region-beginning)
endB (region-end))
(goto-char begB)
(beginning-of-line)
(setq begB (point))
(goto-char endB)
(end-of-line)
(or (eobp) (forward-char)) ; include the newline char
(setq endB (point)))
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
*** empty log message ***
1996-09-20 01:10:05 +00:00
(ediff-regions-internal
bufA begA endA bufB begB endB
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highliting. (ediff-select-difference): take highlighting style into account. (ediff-clone-buffer-for-region-comparison): new function. (ediff-inferior-compare-regions): added comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.
2002-03-20 06:36:18 +00:00
nil ; setup-hook
(if use-current-diff-p ; job name
'ediff-regions-wordwise
'ediff-regions-linewise)
(if use-current-diff-p ; word mode, if diffing current diff
t nil)
new version
1997-05-31 01:10:39 +00:00
;; setup param to pass to ediff-setup
(list (cons 'ediff-split-window-function ediff-split-window-function)))
*** empty log message ***
1996-09-20 01:10:05 +00:00
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(defun ediff-remove-flags-from-buffer (buffer overlay)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((inhibit-read-only t))
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-xemacs-p
(ediff-overlay-put overlay 'begin-glyph nil)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-overlay-put overlay 'before-string nil))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if ediff-xemacs-p
(ediff-overlay-put overlay 'end-glyph nil)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-overlay-put overlay 'after-string nil))
Initial revision
1995-03-16 22:34:51 +00:00
)))
(defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-place-flags-in-buffer1 buf-type ctl-buffer diff)))
(defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no)
new version
1997-07-31 04:04:23 +00:00
(let* ((curr-overl (ediff-with-current-buffer ctl-buffer
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-get-diff-overlay diff-no buf-type)))
(before (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
after beg-of-line flag)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; insert flag before the difference
(goto-char before)
(setq beg-of-line (bolp))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(setq flag (ediff-with-current-buffer ctl-buffer
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if (eq ediff-highlighting-style 'ascii)
(if beg-of-line
ediff-before-flag-bol ediff-before-flag-mol))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; insert the flag itself
(if ediff-xemacs-p
(ediff-overlay-put curr-overl 'begin-glyph flag)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-overlay-put curr-overl 'before-string flag))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; insert the flag after the difference
;; `after' must be set here, after the before-flag was inserted
(setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
(goto-char after)
(setq beg-of-line (bolp))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
new version
1997-07-31 04:04:23 +00:00
(setq flag (ediff-with-current-buffer ctl-buffer
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(if (eq ediff-highlighting-style 'ascii)
(if beg-of-line
ediff-after-flag-eol ediff-after-flag-mol))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; insert the flag itself
(if ediff-xemacs-p
(ediff-overlay-put curr-overl 'end-glyph flag)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-overlay-put curr-overl 'after-string flag))
Initial revision
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
;;; Some diff region tests
;; t if diff region is empty.
;; In case of buffer C, t also if it is not a 3way
;; comparison job (merging jobs return t as well).
(defun ediff-empty-diff-region-p (n buf-type)
(if (eq buf-type 'C)
(or (not ediff-3way-comparison-job)
(= (ediff-get-diff-posn 'C 'beg n)
(ediff-get-diff-posn 'C 'end n)))
(= (ediff-get-diff-posn buf-type 'beg n)
(ediff-get-diff-posn buf-type 'end n))))
;; Test if diff region is white space only.
;; If 2-way job and buf-type = C, then returns t.
(defun ediff-whitespace-diff-region-p (n buf-type)
(or (and (eq buf-type 'C) (not ediff-3way-job))
(ediff-empty-diff-region-p n buf-type)
(let ((beg (ediff-get-diff-posn buf-type 'beg n))
(end (ediff-get-diff-posn buf-type 'end n)))
(ediff-with-current-buffer (ediff-get-buffer buf-type)
(save-excursion
(goto-char beg)
(skip-chars-forward ediff-whitespace)
(>= (point) end))))))
(defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
(ediff-with-current-buffer
(ediff-with-current-buffer ctrl-buf (ediff-get-buffer buf-type))
(buffer-substring
(or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf))
(or end (ediff-get-diff-posn buf-type 'end n ctrl-buf)))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; Returns positions of difference sectors in the BUF-TYPE buffer.
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; BUF-TYPE should be a symbol -- `A', `B', or `C'.
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; POS is either `beg' or `end'--it specifies whether you want the position at
;; the beginning of a difference or at the end.
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;;
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; The optional argument N says which difference (default:
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; `ediff-current-difference'). N is the internal difference number (1- what
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; the user sees). The optional argument CONTROL-BUF says
;; which control buffer is in effect in case it is not the current
;; buffer.
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-get-diff-posn (buf-type pos &optional n control-buf)
(let (diff-overlay)
(or control-buf
(setq control-buf (current-buffer)))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer control-buf
Initial revision
1995-03-16 22:34:51 +00:00
(or n (setq n ediff-current-difference))
(if (or (< n 0) (>= n ediff-number-of-differences))
(if (> ediff-number-of-differences 0)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(error ediff-BAD-DIFF-NUMBER
this-command (1+ n) ediff-number-of-differences)
*** empty log message ***
1996-02-16 06:36:35 +00:00
(error ediff-NO-DIFFERENCES)))
Initial revision
1995-03-16 22:34:51 +00:00
(setq diff-overlay (ediff-get-diff-overlay n buf-type)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (not (ediff-buffer-live-p (ediff-overlay-buffer diff-overlay)))
*** empty log message ***
1996-02-16 06:36:35 +00:00
(error ediff-KILLED-VITAL-BUFFER))
Initial revision
1995-03-16 22:34:51 +00:00
(if (eq pos 'beg)
(ediff-overlay-start diff-overlay)
(ediff-overlay-end diff-overlay))
))
*** empty log message ***
1996-09-20 01:10:05 +00:00
;; Restore highlighting to what it should be according to ediff-use-faces,
;; ediff-highlighting-style, and ediff-highlight-all-diffs variables.
(defun ediff-restore-highlighting (&optional ctl-buf)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer (or ctl-buf (current-buffer))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(if (and (ediff-has-face-support-p)
*** empty log message ***
1996-09-20 01:10:05 +00:00
ediff-use-faces
ediff-highlight-all-diffs)
(ediff-paint-background-regions))
(ediff-select-difference ediff-current-difference)))
Initial revision
1995-03-16 22:34:51 +00:00
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; null out difference overlays so they won't slow down future
;; editing operations
;; VEC is either a difference vector or a fine-diff vector
(defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
(if (vectorp (symbol-value vec-var))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(mapcar (lambda (elt)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-delete-overlay
*** empty log message ***
1999-11-01 07:16:15 +00:00
(ediff-get-diff-overlay-from-diff-record elt))
(if fine-diffs-also
(ediff-clear-fine-diff-vector elt))
)
Initial revision
1995-03-16 22:34:51 +00:00
(symbol-value vec-var)))
;; allow them to be garbage collected
(set vec-var nil))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;;; Misc
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; In Emacs, this just makes overlay. In the future, when Emacs will start
Initial revision
1995-03-16 22:34:51 +00:00
;; supporting sticky overlays, this function will make a sticky overlay.
;; BEG and END are expressions telling where overlay starts.
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; If they are numbers or buffers, then all is well. Otherwise, they must
Initial revision
1995-03-16 22:34:51 +00:00
;; be expressions to be evaluated in buffer BUF in order to get the overlay
;; bounds.
;; If BUFF is not a live buffer, then return nil; otherwise, return the
;; newly created overlay.
(defun ediff-make-bullet-proof-overlay (beg end buff)
(if (ediff-buffer-live-p buff)
(let (overl)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buff
Initial revision
1995-03-16 22:34:51 +00:00
(or (number-or-marker-p beg)
(setq beg (eval beg)))
(or (number-or-marker-p end)
(setq end (eval end)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq overl
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-cond-compile-for-xemacs-or-emacs
(make-extent beg end buff) ; xemacs
;; advance front and rear of the overlay
(make-overlay beg end buff nil 'rear-advance) ; emacs
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; never detach
(ediff-overlay-put
overl (if ediff-emacs-p 'evaporate 'detachable) nil)
* 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
;; make overlay open-ended
*** empty log message ***
1996-06-22 01:54:34 +00:00
;; In emacs, it is made open ended at creation time
(if ediff-xemacs-p
(progn
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(ediff-overlay-put overl 'start-open nil)
*** empty log message ***
1996-06-22 01:54:34 +00:00
(ediff-overlay-put overl 'end-open nil)))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-overlay-put overl 'ediff-diff-num 0)
Initial revision
1995-03-16 22:34:51 +00:00
overl))))
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-current-diff-overlay (type)
(if (ediff-has-face-support-p)
(let ((overlay (ediff-get-symbol-from-alist
type ediff-current-diff-overlay-alist))
(buffer (ediff-get-buffer type))
(face (face-name
(symbol-value
(ediff-get-symbol-from-alist
type ediff-current-diff-face-alist)))))
(set overlay
(ediff-make-bullet-proof-overlay (point-max) (point-max) buffer))
(ediff-set-overlay-face (symbol-value overlay) face)
(ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Like other-buffer, but prefers visible buffers and ignores temporary or
;; other insignificant buffers (those beginning with "^[ *]").
;; Gets one arg--buffer name or a list of buffer names (it won't return
;; these buffers).
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; EXCL-BUFF-LIST is an exclusion list.
*** empty log message ***
1999-11-01 07:16:15 +00:00
(defun ediff-other-buffer (excl-buff-lst)
(or (listp excl-buff-lst) (setq excl-buff-lst (list excl-buff-lst)))
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-preserve-cursor-color): new test that avoids rewrawing the screen when changing cursor color. (viper-insert-state-pre-command-sentinel, viper-replace-state-pre-command-sentinel, viper-replace-state-post-command-sentinel): use viper-preserve-cursor-color. Many functions changed to use viper= instead of = when comparing characters. * viper-util.el (viper-memq-char,viper=): new functions for working with characters. (viper-change-cursor-color): fixed buglet. Many functions changed to use viper= instead of = when comparing characters. * viper.el (viper-insert-state-mode-list): added eshell. * ediff-init.el (ediff-before-setup-hook): new hook. Several typos fixed in various docstrings. * ediff-merg.el (ediff-show-clashes-only): docstring typo fixed. * ediff-nult.el (ediff-before-session-group-setup-hooks): new hook. (ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks. * ediff-util.el (ediff-setup): run ediff-before-setup-hook. (ediff-other-buffer): use selected buffers if in Buffer-menu buffer. (ediff-get-selected-buffers): new function. * ediff-vers.el (ediff-vc-internal,ediff-rcs-internal, ediff-vc-merge-internal,ediff-rcs-merge-internal): use save-window-excursion. * ediff-wind.el (ediff-skip-unsuitable-frames): more robust termination check in while loop. * ediff.el (ediff-get-default-file-name): better defaults when in dired buffer. (ediff-files,ediff-merge-files,ediff-files3, ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
2000-10-29 04:56:45 +00:00
(let* ((all-buffers (nconc (ediff-get-selected-buffers) (buffer-list)))
;; we compute this the second time because we need to do memq on it
;; later, and nconc above will break it. Either this or use slow
;; append instead of nconc
(selected-buffers (ediff-get-selected-buffers))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(prefered-buffer (car all-buffers))
visible-dired-buffers
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(excl-buff-name-list
(mapcar
*** empty log message ***
1999-11-01 07:16:15 +00:00
(lambda (b) (cond ((stringp b) b)
((bufferp b) (buffer-name b))))
excl-buff-lst))
;; if at least one buffer on the exclusion list is dired, then force
;; all others to be dired. This is because this means that the user
;; has already chosen a dired buffer before
(use-dired-major-mode
(cond ((null (ediff-buffer-live-p (car excl-buff-lst))) 'unknown)
((eq (ediff-with-current-buffer (car excl-buff-lst) major-mode)
'dired-mode)
'yes)
(t 'no)))
;; significant-buffers must be visible and not belong
;; to the exclusion list `buff-list'
;; We also exclude temporary buffers, but keep mail and gnus buffers
;; Furthermore, we exclude dired buffers, unless they are the only
;; ones visible (and there are at least two of them).
;; Also, any visible window not on the exclusion list that is first in
;; the buffer list is chosen regardless. (This is because the user
;; clicked on it or did something to distinguish it).
Initial revision
1995-03-16 22:34:51 +00:00
(significant-buffers
(mapcar
*** empty log message ***
1999-11-01 07:16:15 +00:00
(lambda (x)
(cond ((member (buffer-name x) excl-buff-name-list) nil)
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-preserve-cursor-color): new test that avoids rewrawing the screen when changing cursor color. (viper-insert-state-pre-command-sentinel, viper-replace-state-pre-command-sentinel, viper-replace-state-post-command-sentinel): use viper-preserve-cursor-color. Many functions changed to use viper= instead of = when comparing characters. * viper-util.el (viper-memq-char,viper=): new functions for working with characters. (viper-change-cursor-color): fixed buglet. Many functions changed to use viper= instead of = when comparing characters. * viper.el (viper-insert-state-mode-list): added eshell. * ediff-init.el (ediff-before-setup-hook): new hook. Several typos fixed in various docstrings. * ediff-merg.el (ediff-show-clashes-only): docstring typo fixed. * ediff-nult.el (ediff-before-session-group-setup-hooks): new hook. (ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks. * ediff-util.el (ediff-setup): run ediff-before-setup-hook. (ediff-other-buffer): use selected buffers if in Buffer-menu buffer. (ediff-get-selected-buffers): new function. * ediff-vers.el (ediff-vc-internal,ediff-rcs-internal, ediff-vc-merge-internal,ediff-rcs-merge-internal): use save-window-excursion. * ediff-wind.el (ediff-skip-unsuitable-frames): more robust termination check in while loop. * ediff.el (ediff-get-default-file-name): better defaults when in dired buffer. (ediff-files,ediff-merge-files,ediff-files3, ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
2000-10-29 04:56:45 +00:00
((memq x selected-buffers) x)
((not (ediff-get-visible-buffer-window x)) nil)
((eq x prefered-buffer) x)
;; if prev selected buffer is dired, look only at
;; dired.
((eq use-dired-major-mode 'yes)
(if (eq (ediff-with-current-buffer x major-mode)
'dired-mode)
x nil))
((eq (ediff-with-current-buffer x major-mode)
'dired-mode)
(if (null use-dired-major-mode)
;; don't know if we must enforce dired.
;; Remember this buffer in case
;; dired buffs are the only ones visible.
(setq visible-dired-buffers
(cons x visible-dired-buffers)))
;; skip, if dired is not forced
nil)
((memq (ediff-with-current-buffer x major-mode)
'(rmail-mode
vm-mode
gnus-article-mode
mh-show-mode))
x)
((string-match "^[ *]" (buffer-name x)) nil)
((string= "*scratch*" (buffer-name x)) nil)
(t x)))
*** empty log message ***
1999-11-01 07:16:15 +00:00
all-buffers))
(clean-significant-buffers (delq nil significant-buffers))
Initial revision
1995-03-16 22:34:51 +00:00
less-significant-buffers)
*** empty log message ***
1999-11-01 07:16:15 +00:00
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(if (and (null clean-significant-buffers)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(> (length visible-dired-buffers) 0))
(setq clean-significant-buffers visible-dired-buffers))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
(cond (clean-significant-buffers (car clean-significant-buffers))
Initial revision
1995-03-16 22:34:51 +00:00
;; try also buffers that are not displayed in windows
((setq less-significant-buffers
(delq nil
(mapcar
*** empty log message ***
1999-11-01 07:16:15 +00:00
(lambda (x)
(cond ((member (buffer-name x) excl-buff-name-list)
nil)
((eq use-dired-major-mode 'yes)
(if (eq (ediff-with-current-buffer
x major-mode)
'dired-mode)
x nil))
((eq (ediff-with-current-buffer x major-mode)
'dired-mode)
nil)
((string-match "^[ *]" (buffer-name x)) nil)
((string= "*scratch*" (buffer-name x)) nil)
(t x)))
all-buffers)))
Initial revision
1995-03-16 22:34:51 +00:00
(car less-significant-buffers))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(t "*scratch*"))
Initial revision
1995-03-16 22:34:51 +00:00
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-preserve-cursor-color): new test that avoids rewrawing the screen when changing cursor color. (viper-insert-state-pre-command-sentinel, viper-replace-state-pre-command-sentinel, viper-replace-state-post-command-sentinel): use viper-preserve-cursor-color. Many functions changed to use viper= instead of = when comparing characters. * viper-util.el (viper-memq-char,viper=): new functions for working with characters. (viper-change-cursor-color): fixed buglet. Many functions changed to use viper= instead of = when comparing characters. * viper.el (viper-insert-state-mode-list): added eshell. * ediff-init.el (ediff-before-setup-hook): new hook. Several typos fixed in various docstrings. * ediff-merg.el (ediff-show-clashes-only): docstring typo fixed. * ediff-nult.el (ediff-before-session-group-setup-hooks): new hook. (ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks. * ediff-util.el (ediff-setup): run ediff-before-setup-hook. (ediff-other-buffer): use selected buffers if in Buffer-menu buffer. (ediff-get-selected-buffers): new function. * ediff-vers.el (ediff-vc-internal,ediff-rcs-internal, ediff-vc-merge-internal,ediff-rcs-merge-internal): use save-window-excursion. * ediff-wind.el (ediff-skip-unsuitable-frames): more robust termination check in while loop. * ediff.el (ediff-get-default-file-name): better defaults when in dired buffer. (ediff-files,ediff-merge-files,ediff-files3, ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
2000-10-29 04:56:45 +00:00
;; If current buffer is a Buffer-menu buffer, then take the selected buffers
;; and append the buffer at the cursor to the end.
;; This list would be the preferred list.
(defun ediff-get-selected-buffers ()
(if (eq major-mode 'Buffer-menu-mode)
(let ((lis (condition-case nil
(list (Buffer-menu-buffer t))
(error))
))
(save-excursion
(goto-char (point-max))
(while (search-backward "\n>" nil t)
(forward-char 1)
(setq lis (cons (Buffer-menu-buffer t) lis)))
lis))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; Construct a unique buffer name.
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
;; The first one tried is prefixsuffix, then prefix<2>suffix,
Initial revision
1995-03-16 22:34:51 +00:00
;; prefix<3>suffix, etc.
(defun ediff-unique-buffer-name (prefix suffix)
(if (null (get-buffer (concat prefix suffix)))
(concat prefix suffix)
(let ((n 2))
(while (get-buffer (format "%s<%d>%s" prefix n suffix))
(setq n (1+ n)))
(format "%s<%d>%s" prefix n suffix))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-submit-report ()
"Submit bug report on Ediff."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(let ((reporter-prompt-for-summary-p t)
(ctl-buf ediff-control-buffer)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-device-type (ediff-device-type))
Initial revision
1995-03-16 22:34:51 +00:00
varlist salutation buffer-name)
(setq varlist '(ediff-diff-program ediff-diff-options
ediff-patch-program ediff-patch-options
ediff-shell
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
ediff-use-faces
Initial revision
1995-03-16 22:34:51 +00:00
ediff-auto-refine ediff-highlighting-style
ediff-buffer-A ediff-buffer-B ediff-control-buffer
ediff-forward-word-function
ediff-control-frame
ediff-control-frame-parameters
ediff-control-frame-position-function
ediff-prefer-iconified-control-frame
ediff-window-setup-function
ediff-split-window-function
ediff-job-name
ediff-word-mode
buffer-name
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
ediff-device-type
Initial revision
1995-03-16 22:34:51 +00:00
))
(setq salutation "
*** empty log message ***
1999-11-01 07:16:15 +00:00
Congratulations! You may have unearthed a bug in Ediff!
Initial revision
1995-03-16 22:34:51 +00:00
Please make a concise and accurate summary of what happened
and mail it to the address above.
-----------------------------------------------------------
")
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-skip-unsuitable-frames)
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(ediff-reset-mouse)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(switch-to-buffer ediff-msg-buffer)
(erase-buffer)
(delete-other-windows)
(insert "
Please read this first:
----------------------
*** empty log message ***
1999-11-01 07:16:15 +00:00
Some ``bugs'' may actually be no bugs at all. For instance, if you are
Initial revision
1995-03-16 22:34:51 +00:00
reporting that certain difference regions are not matched as you think they
should, this is most likely due to the way Unix diff program decides what
*** empty log message ***
1999-11-01 07:16:15 +00:00
constitutes a difference region. Ediff is an Emacs interface to diff, and
Initial revision
1995-03-16 22:34:51 +00:00
it has nothing to do with those decisions---it only takes the output from
diff and presents it in a way that is better suited for human browsing and
manipulation.
If Emacs happens to dump core, this is NOT an Ediff problem---it is
*** empty log message ***
1999-11-01 07:16:15 +00:00
an Emacs bug. Report this to Emacs maintainers.
Initial revision
1995-03-16 22:34:51 +00:00
Another popular topic for reports is compilation messages. Because Ediff
interfaces to several other packages and runs under Emacs and XEmacs,
byte-compilation may produce output like this:
While compiling toplevel forms in file ediff.el:
** reference to free variable pm-color-alist
........................
While compiling the end of the data:
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
** The following functions are not known to be defined:
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
ediff-valid-color-p, ediff-set-face,
Initial revision
1995-03-16 22:34:51 +00:00
........................
These are NOT errors, but inevitable warnings, which ought to be ignored.
Please do not report those and similar things. However, comments and
suggestions are always welcome.
Mail anyway? (y or n) ")
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(if (y-or-n-p "Mail anyway? ")
(progn
(if (ediff-buffer-live-p ctl-buf)
(set-buffer ctl-buf))
(setq buffer-name (buffer-name))
(require 'reporter)
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
(reporter-submit-bug-report "kifer@cs.stonybrook.edu"
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-version)
varlist
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
nil
Initial revision
1995-03-16 22:34:51 +00:00
'delete-other-windows
salutation))
(bury-buffer)
(beep 1)(message "Bug report aborted")
(if (ediff-buffer-live-p ctl-buf)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ctl-buf
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-recenter 'no-rehighlight))))
))
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
;; Find an appropriate syntax table for everyone to use
;; If buffer B is not fundamental or text mode, use its syntax table
;; Otherwise, use buffer B's.
;; The syntax mode is used in ediff-forward-word-function
;; The important thing is that every buffer should use the same syntax table
;; during the refinement operation
(defun ediff-choose-syntax-table ()
(setq ediff-syntax-table
(ediff-with-current-buffer ediff-buffer-A
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(if (not (memq major-mode
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
'(fundamental-mode text-mode indented-text-mode)))
(syntax-table))))
(if (not ediff-syntax-table)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
(setq ediff-syntax-table
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
(ediff-with-current-buffer ediff-buffer-B
(syntax-table))))
)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-deactivate-mark ()
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-cond-compile-for-xemacs-or-emacs
(zmacs-deactivate-region) ; xemacs
(deactivate-mark) ; emacs
))
*** empty log message ***
1996-12-28 02:53:04 +00:00
(defun ediff-activate-mark ()
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): moved here from viper.el. (viper-set-unread-command-events): moved to viper-util.el (viper-check-minibuffer-overlay): make sure viper-minibuffer-overlay is moved to cover the entire input field. * viper-util.el: use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events, viper-char-symbol-sequence-p, viper-char-array-p): moved here. * viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs. * viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p, viper-event-vector-p): moved to viper-util.el * viper.el (viper-standard-value): moved to viper-cmd.el. Use viper-cond-compile-for-xemacs-or-emacs. * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of ediff-xemacs-p. (ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer, ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents): moved to ediff-util.el. (ediff-event-key): moved here. * ediff-merge.el: got rid of unreferenced variables. * ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs. (ediff-cleanup-mess): improved the way windows are set up after quitting ediff. (ediff-janitor): use ediff-dispose-of-variant-according-to-user. (ediff-dispose-of-variant-according-to-user): new function designed to be smarter and also understands indirect buffers. (ediff-highlight-diff-in-one-buffer, ediff-unhighlight-diff-in-one-buffer, ediff-unhighlight-diffs-totally-in-one-buffer, ediff-highlight-diff, ediff-highlight-diff, ediff-unhighlight-diff, ediff-unhighlight-diffs-totally, ediff-empty-diff-region-p, ediff-whitespace-diff-region-p, ediff-get-region-contents, ediff-make-current-diff-overlay): moved here. (ediff-format-bindings-of): new function by Hannu Koivisto <azure@iki.fi>. (ediff-setup): make sure the merge buffer is always widened and modifiable. (ediff-write-merge-buffer-and-maybe-kill): refuse to write the result of a merge into a file visited by another buffer. (ediff-arrange-autosave-in-merge-jobs): check if the merge file is visited by another buffer and ask to save/delete that buffer. (ediff-verify-file-merge-buffer): new function to do the above. * ediff-vers.el: load ediff-init.el at compile time. * ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff.el (ediff-windows, ediff-regions-wordwise, ediff-regions-linewise): use indirect buffers to improve robustness and make it possible to compare regions of the same buffer (even overlapping regions). (ediff-clone-buffer-for-region-comparison, ediff-clone-buffer-for-window-comparison): new functions. (ediff-files-internal): refuse to compare identical files. (ediff-regions-internal): get rid of the warning about comparing regions of the same buffer. * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. (ediff-wordify): Bind forward-word-function outside loop. (ediff-copy-to-buffer): Use insert-buffer-substring rather than consing buffer contents. (ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
(ediff-cond-compile-for-xemacs-or-emacs
(zmacs-activate-region) ; xemacs
(setq mark-active t) ; emacs
))
Initial revision
1995-03-16 22:34:51 +00:00
(cond ((fboundp 'nuke-selective-display)
2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-hooks.el: Put back the autoloads (for compatibility with XEmacs). * ediff-init.el: Use defalias instead of fset. * ediff-util.el: Use defalias instead of fset. * viper-util.el (viper-chars-in-region): simplification. * viper.el (viper-emacs-state-mode-list): added modes.
2002-09-18 04:23:27 +00:00
;; XEmacs has nuke-selective-display
(defalias 'ediff-nuke-selective-display 'nuke-selective-display))
Initial revision
1995-03-16 22:34:51 +00:00
(t
(defun ediff-nuke-selective-display ()
(save-excursion
(save-restriction
(widen)
(goto-char (point-min))
(let ((mod-p (buffer-modified-p))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
buffer-read-only end)
Initial revision
1995-03-16 22:34:51 +00:00
(and (eq t selective-display)
(while (search-forward "\^M" nil t)
(end-of-line)
(setq end (point))
(beginning-of-line)
(while (search-forward "\^M" end t)
(delete-char -1)
(insert "\^J"))))
(set-buffer-modified-p mod-p)
(setq selective-display nil)))))
))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; The next two are modified versions from emerge.el.
Initial revision
1995-03-16 22:34:51 +00:00
;; VARS must be a list of symbols
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; ediff-save-variables returns an association list: ((var . val) ...)
(defsubst ediff-save-variables (vars)
*** empty log message ***
1999-11-01 07:16:15 +00:00
(mapcar (lambda (v) (cons v (symbol-value v)))
Initial revision
1995-03-16 22:34:51 +00:00
vars))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
;; VARS is a list of variable symbols.
(defun ediff-restore-variables (vars assoc-list)
Initial revision
1995-03-16 22:34:51 +00:00
(while vars
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(set (car vars) (cdr (assoc (car vars) assoc-list)))
(setq vars (cdr vars))))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(defun ediff-change-saved-variable (var value buf-type)
(let* ((assoc-list
new version
1997-07-31 04:04:23 +00:00
(symbol-value (ediff-get-symbol-from-alist
buf-type
ediff-buffer-values-orig-alist)))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(assoc-elt (assoc var assoc-list)))
(if assoc-elt
(setcdr assoc-elt value))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; must execute in control buf
(defun ediff-save-protected-variables ()
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(setq ediff-buffer-values-orig-A
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-A
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-save-variables ediff-protected-variables)))
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(setq ediff-buffer-values-orig-B
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-B
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-save-variables ediff-protected-variables)))
(if ediff-3way-comparison-job
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(setq ediff-buffer-values-orig-C
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-save-variables ediff-protected-variables))))
(if (ediff-buffer-live-p ediff-ancestor-buffer)
(setq ediff-buffer-values-orig-Ancestor
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-ancestor-buffer
Initial revision
1995-03-16 22:34:51 +00:00
(ediff-save-variables ediff-protected-variables)))))
;; must execute in control buf
(defun ediff-restore-protected-variables ()
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
(let ((values-A ediff-buffer-values-orig-A)
(values-B ediff-buffer-values-orig-B)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(values-C ediff-buffer-values-orig-C)
(values-Ancestor ediff-buffer-values-orig-Ancestor))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-A
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-restore-variables ediff-protected-variables values-A))
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-B
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-restore-variables ediff-protected-variables values-B))
(if ediff-3way-comparison-job
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-buffer-C
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-restore-variables ediff-protected-variables values-C)))
(if (ediff-buffer-live-p ediff-ancestor-buffer)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer ediff-ancestor-buffer
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-restore-variables ediff-protected-variables values-Ancestor)))
))
Initial revision
1995-03-16 22:34:51 +00:00
*** empty log message ***
1999-11-01 07:16:15 +00:00
;; save BUFFER in FILE. used in hooks.
*** empty log message ***
1996-02-16 06:36:35 +00:00
(defun ediff-save-buffer-in-file (buffer file)
new version
1997-07-31 04:04:23 +00:00
(ediff-with-current-buffer buffer
*** empty log message ***
1996-02-16 06:36:35 +00:00
(write-file file)))
Initial revision
1995-03-16 22:34:51 +00:00
;;; Debug
(ediff-defvar-local ediff-command-begin-time '(0 0 0) "")
;; calculate time used by command
(defun ediff-calc-command-time ()
(let ((end (current-time))
micro sec)
(setq micro
(if (>= (nth 2 end) (nth 2 ediff-command-begin-time))
(- (nth 2 end) (nth 2 ediff-command-begin-time))
(+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time)))))
(setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time)))
(or (equal ediff-command-begin-time '(0 0 0))
(message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro))))
(defsubst ediff-save-time ()
(setq ediff-command-begin-time (current-time)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-profile ()
"Toggle profiling Ediff commands."
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r comand. (viper-buffer-search-enable): Fixed format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name instead of viper-info-on-file. (ex-set-visited-file-name): New function. * viper.el (viper-emacs-state-mode-list): Added mail-mode. * ediff-mult.el (ediff-meta-mark-equal-files): Added optional action argument. * ediff-init.el: Fixed some doc strings. * ediff-util.el (ediff-after-quit-hook-internal): New variable. Got rid of make-local-hook. * ediff-wind.el (ediff-setup-control-frame): Got rid of make-local-hook.
2001-12-24 05:50:31 +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
(ediff-cond-compile-for-xemacs-or-emacs
(make-local-hook 'post-command-hook) ; xemacs form
nil ; emacs form
)
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r comand. (viper-buffer-search-enable): Fixed format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name instead of viper-info-on-file. (ex-set-visited-file-name): New function. * viper.el (viper-emacs-state-mode-list): Added mail-mode. * ediff-mult.el (ediff-meta-mark-equal-files): Added optional action argument. * ediff-init.el: Fixed some doc strings. * ediff-util.el (ediff-after-quit-hook-internal): New variable. Got rid of make-local-hook. * ediff-wind.el (ediff-setup-control-frame): Got rid of make-local-hook.
2001-12-24 05:50:31 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
(let ((pre-hook 'pre-command-hook)
(post-hook 'post-command-hook))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(if (not (equal ediff-command-begin-time '(0 0 0)))
(progn (remove-hook pre-hook 'ediff-save-time)
(remove-hook post-hook 'ediff-calc-command-time)
(setq ediff-command-begin-time '(0 0 0))
(message "Ediff profiling disabled"))
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu> * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r comand. (viper-buffer-search-enable): Fixed format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name instead of viper-info-on-file. (ex-set-visited-file-name): New function. * viper.el (viper-emacs-state-mode-list): Added mail-mode. * ediff-mult.el (ediff-meta-mark-equal-files): Added optional action argument. * ediff-init.el: Fixed some doc strings. * ediff-util.el (ediff-after-quit-hook-internal): New variable. Got rid of make-local-hook. * ediff-wind.el (ediff-setup-control-frame): Got rid of make-local-hook.
2001-12-24 05:50:31 +00:00
(add-hook pre-hook 'ediff-save-time t 'local)
(add-hook post-hook 'ediff-calc-command-time nil 'local)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(message "Ediff profiling enabled"))))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-print-diff-vector (diff-vector-var)
(princ (format "\n*** %S ***\n" diff-vector-var))
*** empty log message ***
1999-11-01 07:16:15 +00:00
(mapcar (lambda (overl-vec)
(princ
(format
"Diff %d: \tOverlay: %S
Initial revision
1995-03-16 22:34:51 +00:00
\t\tFine diffs: %s
\t\tNo-fine-diff-flag: %S
\t\tState-of-diff:\t %S
\t\tState-of-merge:\t %S
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
"
*** empty log message ***
1999-11-01 07:16:15 +00:00
(1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
(aref overl-vec 0)
;; fine-diff-vector
(if (= (length (aref overl-vec 1)) 0)
"none\n"
(mapconcat 'prin1-to-string
(aref overl-vec 1) "\n\t\t\t "))
(aref overl-vec 2) ; no fine diff flag
(aref overl-vec 3) ; state-of-diff
(aref overl-vec 4) ; state-of-merge
)))
Initial revision
1995-03-16 22:34:51 +00:00
(eval diff-vector-var)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
(defun ediff-debug-info ()
(interactive)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-barf-if-not-control-buffer)
Initial revision
1995-03-16 22:34:51 +00:00
(with-output-to-temp-buffer ediff-debug-buffer
(ediff-status-info, ediff-debug-info): Put temp buffer into fundamental mode. (ediff-set-difference): Use copy-sequence if available.
2000-11-10 22:35:35 +00:00
(ediff-with-current-buffer standard-output
(fundamental-mode))
Initial revision
1995-03-16 22:34:51 +00:00
(princ (format "\nCtl buffer: %S\n" ediff-control-buffer))
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(ediff-print-diff-vector (intern "ediff-difference-vector-A"))
(ediff-print-diff-vector (intern "ediff-difference-vector-B"))
(ediff-print-diff-vector (intern "ediff-difference-vector-C"))
(ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor"))
Initial revision
1995-03-16 22:34:51 +00:00
))
*** empty log message ***
1996-02-16 06:36:35 +00:00
;;; General utilities
;; this uses comparison-func to decide who is a member
(defun ediff-member (elt lis comparison-func)
(while (and lis (not (funcall comparison-func (car lis) elt)))
(setq lis (cdr lis)))
lis)
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
;; Make a readable representation of the invocation sequence for FUNC-DEF.
;; It would either be a key or M-x something.
(defun ediff-format-bindings-of (func-def)
(let ((desc (car (where-is-internal func-def
overriding-local-map
nil nil))))
(if desc
(key-description desc)
(format "M-x %s" func-def))))
*** empty log message ***
1996-02-16 06:36:35 +00:00
;; this uses comparison-func to decide who is a member, and this determines how
;; intersection looks like
(defun ediff-intersection (lis1 lis2 comparison-func)
(let ((result (list 'a)))
(while lis1
(if (ediff-member (car lis1) lis2 comparison-func)
(nconc result (list (car lis1))))
(setq lis1 (cdr lis1)))
(cdr result)))
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
;; eliminates duplicates using comparison-func
(defun ediff-union (lis1 lis2 comparison-func)
(let ((result (list 'a)))
(while lis1
(or (ediff-member (car lis1) (cdr result) comparison-func)
(nconc result (list (car lis1))))
(setq lis1 (cdr lis1)))
(while lis2
(or (ediff-member (car lis2) (cdr result) comparison-func)
(nconc result (list (car lis2))))
(setq lis2 (cdr lis2)))
(cdr result)))
;; eliminates duplicates using comparison-func
(defun ediff-set-difference (lis1 lis2 comparison-func)
(let ((result (list 'a)))
(while lis1
(or (ediff-member (car lis1) (cdr result) comparison-func)
(ediff-member (car lis1) lis2 comparison-func)
(nconc result (list (car lis1))))
(setq lis1 (cdr lis1)))
(cdr result)))
(ediff-status-info, ediff-debug-info): Put temp buffer into fundamental mode. (ediff-set-difference): Use copy-sequence if available.
2000-11-10 22:35:35 +00:00
(if (fboundp 'copy-sequence)
(ediff-copy-list): Use `defalias' instead of `fset' and `symbol-function'.
2002-08-05 22:37:25 +00:00
(defalias 'ediff-copy-list 'copy-sequence)
(ediff-status-info, ediff-debug-info): Put temp buffer into fundamental mode. (ediff-set-difference): Use copy-sequence if available.
2000-11-10 22:35:35 +00:00
(defun ediff-copy-list (list)
(if (consp list)
*** empty log message ***
1996-02-16 06:36:35 +00:00
;;;(let ((res nil))
;;; (while (consp list) (push (pop list) res))
;;; (prog1 (nreverse res) (setcdr res list)))
(ediff-status-info, ediff-debug-info): Put temp buffer into fundamental mode. (ediff-set-difference): Use copy-sequence if available.
2000-11-10 22:35:35 +00:00
(let (res elt)
(while (consp list)
(setq elt (car list)
res (cons elt res)
list (cdr list)))
(nreverse res))
(car list))))
*** empty log message ***
1999-11-01 07:16:15 +00:00
*** empty log message ***
1996-02-16 06:36:35 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;; don't report error if version control package wasn't found
;;(ediff-load-version-control 'silent)
(ediff-toggle-read-only,ediff-read-file-name): replaced abbreviate-file-name with ediff-abbreviate-file-name. (ediff-documentation): bug fix. (ediff-setup,ediff-really-quit): modified to work with Ediff session groups. (ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
(run-hooks 'ediff-load-hook)
Trailing whitespace deleted.
2003-02-04 11:26:42 +00:00
Converted xemacs *screen* nomenclature to *frame*. Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
1995-06-05 23:43:51 +00:00
Initial revision
1995-03-16 22:34:51 +00:00
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
new version
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))
Initial revision
1995-03-16 22:34:51 +00:00
;;; End:
;;; ediff-util.el ends here
Reference in New Issue Copy Permalink