2019-06-21 01:16:54 -04:00
|
|
|
;;; ediff-wind.el --- window manipulation utilities -*- lexical-binding:t -*-
|
1996-01-14 07:34:30 +00:00
|
|
|
|
2021-01-01 01:13:56 -08:00
|
|
|
;; Copyright (C) 1994-1997, 2000-2021 Free Software Foundation, Inc.
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
|
2010-08-29 12:17:13 -04:00
|
|
|
;; Package: ediff
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1995-03-16 22:34:51 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
;;; Code:
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;; Compiler pacifier
|
|
|
|
|
(defvar icon-title-format)
|
|
|
|
|
(defvar top-toolbar-height)
|
|
|
|
|
(defvar bottom-toolbar-height)
|
|
|
|
|
(defvar left-toolbar-height)
|
|
|
|
|
(defvar right-toolbar-height)
|
|
|
|
|
(defvar left-toolbar-width)
|
|
|
|
|
(defvar right-toolbar-width)
|
|
|
|
|
(defvar default-menubar)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
(defvar top-gutter)
|
1996-06-22 01:54:34 +00:00
|
|
|
(defvar frame-icon-title-format)
|
1997-05-31 01:10:39 +00:00
|
|
|
(defvar ediff-diff-status)
|
|
|
|
|
|
2013-05-23 00:10:05 -07:00
|
|
|
(require 'ediff-init)
|
|
|
|
|
(require 'ediff-help)
|
1996-06-22 01:54:34 +00:00
|
|
|
;; end pacifier
|
|
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defgroup ediff-window nil
|
2005-07-04 02:03:47 +00:00
|
|
|
"Ediff window manipulation."
|
1997-05-31 01:10:39 +00:00
|
|
|
:prefix "ediff-"
|
|
|
|
|
:group 'ediff
|
|
|
|
|
:group 'frames)
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2008-04-04 07:51:27 +00:00
|
|
|
;; Determine which window setup function to use based on current window system.
|
|
|
|
|
(defun ediff-choose-window-setup-function-automatically ()
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 12:13:02 +08:00
|
|
|
(declare (obsolete ediff-setup-windows-default "24.3"))
|
2008-04-04 07:51:27 +00:00
|
|
|
(if (ediff-window-display-p)
|
2017-10-26 22:15:41 -04:00
|
|
|
#'ediff-setup-windows-multiframe
|
|
|
|
|
#'ediff-setup-windows-plain))
|
2008-04-04 07:51:27 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(defcustom ediff-window-setup-function #'ediff-setup-windows-default
|
2008-12-03 05:48:14 +00:00
|
|
|
"Function called to set up windows.
|
2012-04-26 11:04:36 +08:00
|
|
|
Ediff provides a choice of three functions:
|
|
|
|
|
(1) `ediff-setup-windows-multiframe', which sets the control panel
|
|
|
|
|
in a separate frame.
|
|
|
|
|
(2) `ediff-setup-windows-plain', which does everything in one frame
|
|
|
|
|
(3) `ediff-setup-windows-default' (the default), which does (1)
|
|
|
|
|
on a graphical display and (2) on a text terminal.
|
|
|
|
|
|
|
|
|
|
The command \\[ediff-toggle-multiframe] can be used to toggle
|
|
|
|
|
between the multiframe display and the single frame display. If
|
|
|
|
|
the multiframe function detects that one of the buffers A/B is
|
|
|
|
|
seen in some other frame, it will try to keep that buffer in that
|
|
|
|
|
frame.
|
2008-04-04 07:51:27 +00:00
|
|
|
|
|
|
|
|
If you don't like any of the two provided functions, write your own one.
|
1995-03-16 22:34:51 +00:00
|
|
|
The basic guidelines:
|
|
|
|
|
1. It should leave the control buffer current and the control window
|
1999-12-18 16:14:32 +00:00
|
|
|
selected.
|
|
|
|
|
2. It should set `ediff-window-A', `ediff-window-B', `ediff-window-C',
|
|
|
|
|
and `ediff-control-window' to contain window objects that display
|
1995-03-16 22:34:51 +00:00
|
|
|
the corresponding buffers.
|
|
|
|
|
3. It should accept the following arguments:
|
|
|
|
|
buffer-A, buffer-B, buffer-C, control-buffer
|
|
|
|
|
Buffer C may not be used in jobs that compare only two buffers.
|
|
|
|
|
If you plan to do something fancy, take a close look at how the two
|
1997-05-31 01:10:39 +00:00
|
|
|
provided functions are written."
|
2012-04-26 11:04:36 +08:00
|
|
|
:type '(choice (const :tag "Choose Automatically" ediff-setup-windows-default)
|
|
|
|
|
(const :tag "Multi Frame" ediff-setup-windows-multiframe)
|
2002-07-26 02:11:28 +00:00
|
|
|
(const :tag "Single Frame" ediff-setup-windows-plain)
|
|
|
|
|
(function :tag "Other function"))
|
2012-08-15 09:29:11 -07:00
|
|
|
:version "24.3")
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; indicates if we are in a multiframe setup
|
|
|
|
|
(ediff-defvar-local ediff-multiframe nil "")
|
|
|
|
|
|
|
|
|
|
;; Share of the frame occupied by the merge window (buffer C)
|
|
|
|
|
(ediff-defvar-local ediff-merge-window-share 0.45 "")
|
|
|
|
|
|
|
|
|
|
;; The control window.
|
|
|
|
|
(ediff-defvar-local ediff-control-window nil "")
|
|
|
|
|
;; Official window for buffer A
|
|
|
|
|
(ediff-defvar-local ediff-window-A nil "")
|
|
|
|
|
;; Official window for buffer B
|
|
|
|
|
(ediff-defvar-local ediff-window-B nil "")
|
|
|
|
|
;; Official window for buffer C
|
|
|
|
|
(ediff-defvar-local ediff-window-C nil "")
|
2017-03-14 16:12:29 +09:00
|
|
|
;; Official window for buffer Ancestor
|
|
|
|
|
(ediff-defvar-local ediff-window-Ancestor nil "")
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Ediff's window configuration.
|
|
|
|
|
;; Used to minimize the need to rearrange windows.
|
|
|
|
|
(ediff-defvar-local ediff-window-config-saved "" "")
|
|
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
;; Association between buff-type and ediff-window-*
|
|
|
|
|
(defconst ediff-window-alist
|
|
|
|
|
'((A . ediff-window-A)
|
|
|
|
|
(?A . ediff-window-A)
|
|
|
|
|
(B . ediff-window-B)
|
|
|
|
|
(?B . ediff-window-B)
|
|
|
|
|
(C . ediff-window-C)
|
2017-03-14 16:12:29 +09:00
|
|
|
(?C . ediff-window-C)
|
|
|
|
|
(Ancestor . ediff-window-Ancestor)))
|
1997-07-31 04:04:23 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(defcustom ediff-split-window-function #'split-window-vertically
|
2008-12-03 05:48:14 +00:00
|
|
|
"The function used to split the main window between buffer-A and buffer-B.
|
1995-03-16 22:34:51 +00:00
|
|
|
You can set it to a horizontal split instead of the default vertical split
|
|
|
|
|
by setting this variable to `split-window-horizontally'.
|
|
|
|
|
You can also have your own function to do fancy splits.
|
|
|
|
|
This variable has no effect when buffer-A/B are shown in different frames.
|
1997-05-31 01:10:39 +00:00
|
|
|
In this case, Ediff will use those frames to display these buffers."
|
2008-04-12 09:47:42 +00:00
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Split vertically" split-window-vertically)
|
|
|
|
|
(const :tag "Split horizontally" split-window-horizontally)
|
2019-06-21 01:16:54 -04:00
|
|
|
function))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(defcustom ediff-merge-split-window-function #'split-window-horizontally
|
2008-12-03 05:48:14 +00:00
|
|
|
"The function used to split the main window between buffer-A and buffer-B.
|
1995-03-16 22:34:51 +00:00
|
|
|
You can set it to a vertical split instead of the default horizontal split
|
|
|
|
|
by setting this variable to `split-window-vertically'.
|
|
|
|
|
You can also have your own function to do fancy splits.
|
|
|
|
|
This variable has no effect when buffer-A/B/C are shown in different frames.
|
1997-05-31 01:10:39 +00:00
|
|
|
In this case, Ediff will use those frames to display these buffers."
|
2008-04-12 09:47:42 +00:00
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Split vertically" split-window-vertically)
|
|
|
|
|
(const :tag "Split horizontally" split-window-horizontally)
|
2019-06-21 01:16:54 -04:00
|
|
|
function))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
(defconst ediff-control-frame-parameters
|
1999-12-18 16:14:32 +00:00
|
|
|
(list
|
1996-02-16 06:36:35 +00:00
|
|
|
'(name . "Ediff")
|
|
|
|
|
;;'(unsplittable . t)
|
|
|
|
|
'(minibuffer . nil)
|
2020-03-21 07:59:05 +01:00
|
|
|
'(user-position . t)
|
|
|
|
|
'(vertical-scroll-bars . nil)
|
|
|
|
|
'(menu-bar-lines . 0)
|
|
|
|
|
'(tool-bar-lines . 0)
|
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-special-read-and-insert-char): use
read-key-sequence.
(viper-after-change-undo-hook): enhancements.
(viper-after-change-undo-hook): new hook.
(viper-undo): use viper-after-change-undo-hook.
(viper-add-newline-at-eob-if-necessary): widen before making changes.
(viper-next-line-at-bol): If point is on a widget or a button, simulate
clicking on that widget/button.
* viper.el (viper-mode): allow for a separate cursor color in Emacs
state.
* ediff-diff (ediff-test-patch-utility): catch errors.
(ediff-actual-diff-options, ediff-actual-diff3-options): new variables.
(ediff-set-actual-diff-options): new function.
(ediff-reset-diff-options, ediff-toggle-ignore-case):
use ediff-set-actual-diff-options.
(ediff-extract-diffs): catch errors.
(ediff-whitespace): add nonbreakable space.
(ediff-same-file-contents): catch errors.
* ediff-mult.el (ediff-collect-custom-diffs): save
coding-system-for-read.
* ediff-vers.el (ediff-keep-tmp-versions): new var.
(ediff-vc-internal, ediff-vc-merge-internal): use
ediff-delete-version-file.
(ediff-delete-version-file): new function.
* ediff-wind.el (ediff-control-frame-parameters): set frame fringes.
* ediff.el (ediff-directories, ediff-directory-revisions,
ediff-merge-directories, ediff-merge-directories-with-ancestor,
ediff-directories-internal, ediff-merge-directory-revisions,
ediff-merge-directory-revisions-with-ancestor,
ediff-directories3): use read-directory-name.
2006-06-18 17:08:24 +00:00
|
|
|
'(left-fringe . 0)
|
|
|
|
|
'(right-fringe . 0)
|
2002-10-12 07:13:59 +00:00
|
|
|
;; don't lower but auto-raise
|
1996-02-16 06:36:35 +00:00
|
|
|
'(auto-lower . nil)
|
|
|
|
|
'(auto-raise . t)
|
1999-11-01 07:16:15 +00:00
|
|
|
'(visibility . nil)
|
|
|
|
|
;; make initial frame small to avoid distraction
|
|
|
|
|
'(width . 1) '(height . 1)
|
2017-10-31 08:59:27 +01:00
|
|
|
;; Fullscreen control frames don't make sense (Bug#29026).
|
|
|
|
|
'(fullscreen . nil)
|
1996-02-16 06:36:35 +00:00
|
|
|
;; this blocks queries from window manager as to where to put
|
|
|
|
|
;; ediff's control frame. we put the frame outside the display,
|
|
|
|
|
;; so the initial frame won't jump all over the screen
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(cons 'top (if (fboundp 'display-pixel-height)
|
|
|
|
|
(1+ (display-pixel-height))
|
1996-02-16 06:36:35 +00:00
|
|
|
3000))
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(cons 'left (if (fboundp 'display-pixel-width)
|
|
|
|
|
(1+ (display-pixel-width))
|
1996-02-16 06:36:35 +00:00
|
|
|
3000))
|
|
|
|
|
)
|
1995-03-16 22:34:51 +00:00
|
|
|
"Frame parameters for displaying Ediff Control Panel.
|
1999-11-01 07:16:15 +00:00
|
|
|
Used internally---not a user option.")
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1995-10-06 01:00:10 +00:00
|
|
|
;; position of the mouse; used to decide whether to warp the mouse into ctl
|
|
|
|
|
;; frame
|
|
|
|
|
(ediff-defvar-local ediff-mouse-pixel-position nil "")
|
|
|
|
|
|
|
|
|
|
;; not used for now
|
1996-01-04 23:07:38 +00:00
|
|
|
(defvar ediff-mouse-pixel-threshold 30
|
2020-12-19 17:35:50 +01:00
|
|
|
"If mouse moved more than this many pixels, don't warp mouse into control window.")
|
1995-10-06 01:00:10 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defcustom ediff-grab-mouse t
|
2008-12-03 05:48:14 +00:00
|
|
|
"If t, Ediff will always grab the mouse and put it in the control frame.
|
2015-11-17 15:28:50 -08:00
|
|
|
If `maybe', Ediff will do it sometimes, but not after operations that require
|
1999-11-01 07:16:15 +00:00
|
|
|
relatively long time. If nil, the mouse will be entirely user's
|
1997-05-31 01:10:39 +00:00
|
|
|
responsibility."
|
2019-06-21 01:16:54 -04:00
|
|
|
:type 'boolean)
|
1995-10-06 01:00:10 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(defcustom ediff-control-frame-position-function #'ediff-make-frame-position
|
1995-03-16 22:34:51 +00:00
|
|
|
"Function to call to determine the desired location for the control panel.
|
|
|
|
|
Expects three parameters: the control buffer, the desired width and height
|
1999-11-01 07:16:15 +00:00
|
|
|
of the control frame. It returns an association list
|
2015-09-17 16:08:20 -07:00
|
|
|
of the form \((top . <position>) \(left . <position>))"
|
2019-06-21 01:16:54 -04:00
|
|
|
:type 'function)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
(defcustom ediff-control-frame-upward-shift 42
|
2008-12-03 05:48:14 +00:00
|
|
|
"The upward shift of control frame from the top of buffer A's frame.
|
1995-03-16 22:34:51 +00:00
|
|
|
Measured in pixels.
|
|
|
|
|
This is used by the default control frame positioning function,
|
1999-11-01 07:16:15 +00:00
|
|
|
`ediff-make-frame-position'. This variable is provided for easy
|
|
|
|
|
customization of the default control frame positioning."
|
2019-06-21 01:16:54 -04:00
|
|
|
:type 'integer)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(defcustom ediff-narrow-control-frame-leftward-shift 3
|
2008-12-03 05:48:14 +00:00
|
|
|
"The leftward shift of control frame from the right edge of buf A's frame.
|
1995-03-16 22:34:51 +00:00
|
|
|
Measured in characters.
|
|
|
|
|
This is used by the default control frame positioning function,
|
|
|
|
|
`ediff-make-frame-position' to adjust the position of the control frame
|
1999-11-01 07:16:15 +00:00
|
|
|
when it shows the short menu. This variable is provided for easy
|
1997-05-31 01:10:39 +00:00
|
|
|
customization of the default."
|
2019-06-21 01:16:54 -04:00
|
|
|
:type 'integer)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defcustom ediff-wide-control-frame-rightward-shift 7
|
2008-12-03 05:48:14 +00:00
|
|
|
"The rightward shift of control frame from the left edge of buf A's frame.
|
1995-03-16 22:34:51 +00:00
|
|
|
Measured in characters.
|
|
|
|
|
This is used by the default control frame positioning function,
|
|
|
|
|
`ediff-make-frame-position' to adjust the position of the control frame
|
1999-11-01 07:16:15 +00:00
|
|
|
when it shows the full menu. This variable is provided for easy
|
1997-05-31 01:10:39 +00:00
|
|
|
customization of the default."
|
2019-06-21 01:16:54 -04:00
|
|
|
:type 'integer)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Wide frame display
|
|
|
|
|
|
|
|
|
|
;; t means Ediff is using wide display
|
|
|
|
|
(ediff-defvar-local ediff-wide-display-p nil "")
|
|
|
|
|
;; keeps frame config for toggling wide display
|
1999-12-18 16:14:32 +00:00
|
|
|
(ediff-defvar-local ediff-wide-display-orig-parameters nil
|
1995-03-16 22:34:51 +00:00
|
|
|
"Frame parameters to be restored when the user wants to toggle the wide
|
|
|
|
|
display off.")
|
|
|
|
|
(ediff-defvar-local ediff-wide-display-frame nil
|
|
|
|
|
"Frame to be used for wide display.")
|
2017-10-26 22:15:41 -04:00
|
|
|
(ediff-defvar-local ediff-make-wide-display-function #'ediff-make-wide-display
|
1995-03-16 22:34:51 +00:00
|
|
|
"The value is a function that is called to create a wide display.
|
1999-11-01 07:16:15 +00:00
|
|
|
The function is called without arguments. It should resize the frame in
|
1995-03-16 22:34:51 +00:00
|
|
|
which buffers A, B, and C are to be displayed, and it should save the old
|
|
|
|
|
frame parameters in `ediff-wide-display-orig-parameters'.
|
|
|
|
|
The variable `ediff-wide-display-frame' should be set to contain
|
|
|
|
|
the frame used for the wide display.")
|
|
|
|
|
|
|
|
|
|
;; Frame used for the control panel in a windowing system.
|
|
|
|
|
(ediff-defvar-local ediff-control-frame nil "")
|
|
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defcustom ediff-prefer-iconified-control-frame nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"If t, keep control panel iconified when help message is off.
|
1995-03-16 22:34:51 +00:00
|
|
|
This has effect only on a windowing system.
|
1996-01-04 23:07:38 +00:00
|
|
|
If t, hitting `?' to toggle control panel off iconifies it.
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2020-03-21 07:59:05 +01:00
|
|
|
This is only useful for certain kinds of window managers, such as
|
|
|
|
|
TWM and its derivatives, since the window manager must permit
|
|
|
|
|
keyboard input to go into icons."
|
2019-06-21 01:16:54 -04:00
|
|
|
:type 'boolean)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;;; Functions
|
|
|
|
|
|
2013-09-04 23:30:07 -04:00
|
|
|
(defun ediff-get-window-by-clicking (_wind _prev-wind wind-number)
|
1995-03-16 22:34:51 +00:00
|
|
|
(let (event)
|
|
|
|
|
(message
|
1999-11-01 07:16:15 +00:00
|
|
|
"Select windows by clicking. Please click on Window %d " wind-number)
|
2021-01-02 14:10:17 -08:00
|
|
|
(while (not (ediff-mouse-event-p (setq event
|
|
|
|
|
(read--potential-mouse-event))))
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (sit-for 1) ; if sequence of events, wait till the final word
|
|
|
|
|
(beep 1))
|
|
|
|
|
(message "Please click on Window %d " wind-number))
|
2021-01-02 14:10:17 -08:00
|
|
|
(read--potential-mouse-event) ; discard event
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(posn-window (event-start event))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2000-02-28 06:16:44 +00:00
|
|
|
;; Select the lowest window on the frame.
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-select-lowest-window ()
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(let* ((lowest-window (selected-window))
|
|
|
|
|
(bottom-edge (car (cdr (cdr (cdr (window-edges))))))
|
|
|
|
|
(last-window (save-excursion
|
|
|
|
|
(other-window -1) (selected-window)))
|
|
|
|
|
(window-search t))
|
|
|
|
|
(while window-search
|
|
|
|
|
(let* ((this-window (next-window))
|
|
|
|
|
(next-bottom-edge
|
|
|
|
|
(car (cdr (cdr (cdr (window-edges this-window)))))))
|
|
|
|
|
(if (< bottom-edge next-bottom-edge)
|
|
|
|
|
(setq bottom-edge next-bottom-edge
|
|
|
|
|
lowest-window this-window))
|
|
|
|
|
(select-window this-window)
|
|
|
|
|
(when (eq last-window this-window)
|
|
|
|
|
(select-window lowest-window)
|
|
|
|
|
(setq window-search nil))))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Common window setup routines
|
|
|
|
|
|
|
|
|
|
;; Set up the window configuration. If POS is given, set the points to
|
|
|
|
|
;; the beginnings of the buffers.
|
|
|
|
|
;; When 3way comparison is added, this will have to choose the appropriate
|
|
|
|
|
;; setup function based on ediff-job-name
|
|
|
|
|
(defun ediff-setup-windows (buffer-A buffer-B buffer-C control-buffer)
|
|
|
|
|
;; Make sure we are not in the minibuffer window when we try to delete
|
|
|
|
|
;; all other windows.
|
1995-10-06 01:00:10 +00:00
|
|
|
(run-hooks 'ediff-before-setup-windows-hook)
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (eq (selected-window) (minibuffer-window))
|
|
|
|
|
(other-window 1))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-06-05 23:42:53 +00:00
|
|
|
;; in case user did a no-no on a tty
|
|
|
|
|
(or (ediff-window-display-p)
|
2017-10-26 22:15:41 -04:00
|
|
|
(setq ediff-window-setup-function #'ediff-setup-windows-plain))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(or (ediff-keep-window-config control-buffer)
|
1999-12-18 16:14:32 +00:00
|
|
|
(funcall
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buffer ediff-window-setup-function)
|
1995-03-16 22:34:51 +00:00
|
|
|
buffer-A buffer-B buffer-C control-buffer))
|
1995-10-06 01:00:10 +00:00
|
|
|
(run-hooks 'ediff-after-setup-windows-hook))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2012-04-26 11:04:36 +08:00
|
|
|
(defun ediff-setup-windows-default (buffer-A buffer-B buffer-C control-buffer)
|
|
|
|
|
(funcall (if (display-graphic-p)
|
2019-06-21 01:16:54 -04:00
|
|
|
#'ediff-setup-windows-multiframe
|
|
|
|
|
#'ediff-setup-windows-plain)
|
2012-04-26 11:04:36 +08:00
|
|
|
buffer-A buffer-B buffer-C control-buffer))
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Just set up 3 windows.
|
|
|
|
|
;; Usually used without windowing systems
|
|
|
|
|
;; With windowing, we want to use dedicated frames.
|
|
|
|
|
(defun ediff-setup-windows-plain (buffer-A buffer-B buffer-C control-buffer)
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-multiframe nil))
|
|
|
|
|
(if ediff-merge-job
|
|
|
|
|
(ediff-setup-windows-plain-merge
|
|
|
|
|
buffer-A buffer-B buffer-C control-buffer)
|
1999-12-18 16:14:32 +00:00
|
|
|
(ediff-setup-windows-plain-compare
|
1995-03-16 22:34:51 +00:00
|
|
|
buffer-A buffer-B buffer-C control-buffer)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2013-05-23 00:10:05 -07:00
|
|
|
(autoload 'ediff-setup-control-buffer "ediff-util")
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-setup-windows-plain-merge (buf-A buf-B buf-C control-buffer)
|
1995-06-05 23:42:53 +00:00
|
|
|
;; skip dedicated and unsplittable frames
|
|
|
|
|
(ediff-destroy-control-frame control-buffer)
|
1996-02-16 06:36:35 +00:00
|
|
|
(let ((window-min-height 1)
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-Ancestor-p (with-current-buffer control-buffer
|
2017-03-14 16:12:29 +09:00
|
|
|
ediff-merge-with-ancestor-job))
|
1999-12-18 16:14:32 +00:00
|
|
|
split-window-function
|
1995-03-16 22:34:51 +00:00
|
|
|
merge-window-share merge-window-lines
|
2017-10-26 22:15:41 -04:00
|
|
|
(buf-Ancestor (with-current-buffer control-buffer
|
2017-03-14 16:12:29 +09:00
|
|
|
ediff-ancestor-buffer))
|
|
|
|
|
wind-A wind-B wind-C wind-Ancestor)
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq merge-window-share ediff-merge-window-share
|
|
|
|
|
;; this lets us have local versions of ediff-split-window-function
|
|
|
|
|
split-window-function ediff-split-window-function))
|
|
|
|
|
(delete-other-windows)
|
2008-04-04 07:51:27 +00:00
|
|
|
(set-window-dedicated-p (selected-window) nil)
|
1995-03-16 22:34:51 +00:00
|
|
|
(split-window-vertically)
|
|
|
|
|
(ediff-select-lowest-window)
|
|
|
|
|
(ediff-setup-control-buffer control-buffer)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; go to the upper window and split it betw A, B, and possibly C
|
1999-12-18 16:14:32 +00:00
|
|
|
(other-window 1)
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq merge-window-lines
|
|
|
|
|
(max 2 (round (* (window-height) merge-window-share))))
|
|
|
|
|
(switch-to-buffer buf-A)
|
|
|
|
|
(setq wind-A (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(split-window-vertically (max 2 (- (window-height) merge-window-lines)))
|
1999-12-18 16:14:32 +00:00
|
|
|
(if (eq (selected-window) wind-A)
|
1995-03-16 22:34:51 +00:00
|
|
|
(other-window 1))
|
|
|
|
|
(setq wind-C (selected-window))
|
|
|
|
|
(switch-to-buffer buf-C)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-03-14 16:12:29 +09:00
|
|
|
(when (and ediff-show-ancestor with-Ancestor-p)
|
|
|
|
|
(select-window wind-C)
|
|
|
|
|
(funcall split-window-function)
|
|
|
|
|
(when (eq (selected-window) wind-C)
|
|
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-Ancestor)
|
|
|
|
|
(setq wind-Ancestor (selected-window)))
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window wind-A)
|
|
|
|
|
(funcall split-window-function)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (eq (selected-window) wind-A)
|
|
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-B)
|
|
|
|
|
(setq wind-B (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-window-A wind-A
|
|
|
|
|
ediff-window-B wind-B
|
2017-03-14 16:12:29 +09:00
|
|
|
ediff-window-C wind-C
|
|
|
|
|
ediff-window-Ancestor wind-Ancestor))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-select-lowest-window)
|
|
|
|
|
(ediff-setup-control-buffer control-buffer)
|
|
|
|
|
))
|
|
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; This function handles all comparison jobs, including 3way jobs
|
|
|
|
|
(defun ediff-setup-windows-plain-compare (buf-A buf-B buf-C control-buffer)
|
|
|
|
|
;; skip dedicated and unsplittable frames
|
1995-06-05 23:42:53 +00:00
|
|
|
(ediff-destroy-control-frame control-buffer)
|
1996-02-16 06:36:35 +00:00
|
|
|
(let ((window-min-height 1)
|
1995-03-16 22:34:51 +00:00
|
|
|
split-window-function wind-width-or-height
|
|
|
|
|
three-way-comparison
|
1995-06-05 23:42:53 +00:00
|
|
|
wind-A-start wind-B-start wind-A wind-B wind-C)
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq wind-A-start (ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type
|
|
|
|
|
'A ediff-narrow-bounds))
|
|
|
|
|
wind-B-start (ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type
|
|
|
|
|
'B ediff-narrow-bounds))
|
|
|
|
|
;; this lets us have local versions of ediff-split-window-function
|
|
|
|
|
split-window-function ediff-split-window-function
|
|
|
|
|
three-way-comparison ediff-3way-comparison-job))
|
2008-11-16 04:55:45 +00:00
|
|
|
;; if in minibuffer go somewhere else
|
|
|
|
|
(if (save-match-data
|
2015-09-17 16:08:20 -07:00
|
|
|
(string-match "\\*Minibuf-" (buffer-name (window-buffer))))
|
2008-11-16 04:55:45 +00:00
|
|
|
(select-window (next-window nil 'ignore-minibuf)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(delete-other-windows)
|
2008-04-04 07:51:27 +00:00
|
|
|
(set-window-dedicated-p (selected-window) nil)
|
1995-03-16 22:34:51 +00:00
|
|
|
(split-window-vertically)
|
|
|
|
|
(ediff-select-lowest-window)
|
|
|
|
|
(ediff-setup-control-buffer control-buffer)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; go to the upper window and split it betw A, B, and possibly C
|
1999-12-18 16:14:32 +00:00
|
|
|
(other-window 1)
|
1995-03-16 22:34:51 +00:00
|
|
|
(switch-to-buffer buf-A)
|
|
|
|
|
(setq wind-A (selected-window))
|
|
|
|
|
(if three-way-comparison
|
|
|
|
|
(setq wind-width-or-height
|
2017-10-26 22:15:41 -04:00
|
|
|
(/ (if (eq split-window-function #'split-window-vertically)
|
1995-03-16 22:34:51 +00:00
|
|
|
(window-height wind-A)
|
|
|
|
|
(window-width wind-A))
|
|
|
|
|
3)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(funcall split-window-function wind-width-or-height)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (eq (selected-window) wind-A)
|
|
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-B)
|
|
|
|
|
(setq wind-B (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if three-way-comparison
|
|
|
|
|
(progn
|
|
|
|
|
(funcall split-window-function) ; equally
|
|
|
|
|
(if (eq (selected-window) wind-B)
|
|
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-C)
|
|
|
|
|
(setq wind-C (selected-window))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buffer
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-window-A wind-A
|
|
|
|
|
ediff-window-B wind-B
|
|
|
|
|
ediff-window-C wind-C))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; It is unlikely that we will want to implement 3way window comparison.
|
|
|
|
|
;; So, only buffers A and B are used here.
|
1995-06-05 23:42:53 +00:00
|
|
|
(if ediff-windows-job
|
1995-03-16 22:34:51 +00:00
|
|
|
(progn
|
|
|
|
|
(set-window-start wind-A wind-A-start)
|
|
|
|
|
(set-window-start wind-B wind-B-start)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-select-lowest-window)
|
|
|
|
|
(ediff-setup-control-buffer control-buffer)
|
|
|
|
|
))
|
|
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
;; dispatch an appropriate window setup function
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-setup-windows-multiframe (buf-A buf-B buf-C control-buf)
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-multiframe t))
|
|
|
|
|
(if ediff-merge-job
|
|
|
|
|
(ediff-setup-windows-multiframe-merge buf-A buf-B buf-C control-buf)
|
|
|
|
|
(ediff-setup-windows-multiframe-compare buf-A buf-B buf-C control-buf)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-setup-windows-multiframe-merge (buf-A buf-B buf-C control-buf)
|
2017-10-26 22:15:41 -04:00
|
|
|
;; Algorithm:
|
|
|
|
|
;; 1. Never use frames that have dedicated windows in them---it is bad to
|
|
|
|
|
;; destroy dedicated windows.
|
|
|
|
|
;; 2. If A and B are in the same frame but C's frame is different--- use one
|
|
|
|
|
;; frame for A and B and use a separate frame for C.
|
|
|
|
|
;; 3. If C's frame is non-existent, then: if the first suitable
|
|
|
|
|
;; non-dedicated frame is different from A&B's, then use it for C.
|
|
|
|
|
;; Otherwise, put A,B, and C in one frame.
|
|
|
|
|
;; 4. If buffers A, B, C are is separate frames, use them to display these
|
|
|
|
|
;; buffers.
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1999-12-18 16:14:32 +00:00
|
|
|
;; Skip dedicated or iconified frames.
|
1995-06-05 23:42:53 +00:00
|
|
|
;; Unsplittable frames are taken care of later.
|
2019-06-21 01:16:54 -04:00
|
|
|
;; (ediff-skip-unsuitable-frames 'ok-unsplittable)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
(let* ((window-min-height 1)
|
1995-03-16 22:34:51 +00:00
|
|
|
(wind-A (ediff-get-visible-buffer-window buf-A))
|
|
|
|
|
(wind-B (ediff-get-visible-buffer-window buf-B))
|
|
|
|
|
(wind-C (ediff-get-visible-buffer-window buf-C))
|
2017-10-26 22:15:41 -04:00
|
|
|
(buf-Ancestor (with-current-buffer control-buf
|
2017-03-14 16:12:29 +09:00
|
|
|
ediff-ancestor-buffer))
|
|
|
|
|
(wind-Ancestor (ediff-get-visible-buffer-window buf-Ancestor))
|
1995-06-05 23:42:53 +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)))
|
2017-03-14 16:12:29 +09:00
|
|
|
(frame-Ancestor (if wind-Ancestor (window-frame wind-Ancestor)))
|
1995-03-16 22:34:51 +00:00
|
|
|
;; on wide display, do things in one frame
|
1999-12-18 16:14:32 +00:00
|
|
|
(force-one-frame
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf ediff-wide-display-p))
|
1995-03-16 22:34:51 +00:00
|
|
|
;; this lets us have local versions of ediff-split-window-function
|
1999-12-18 16:14:32 +00:00
|
|
|
(split-window-function
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf ediff-split-window-function))
|
1995-03-16 22:34:51 +00:00
|
|
|
(orig-wind (selected-window))
|
1995-06-05 23:42:53 +00:00
|
|
|
(orig-frame (selected-frame))
|
1995-03-16 22:34:51 +00:00
|
|
|
(use-same-frame (or force-one-frame
|
1996-06-22 01:54:34 +00:00
|
|
|
;; A and C must be in one frame
|
1995-03-16 22:34:51 +00:00
|
|
|
(eq frame-A (or frame-C orig-frame))
|
1996-06-22 01:54:34 +00:00
|
|
|
;; B and C must be in one frame
|
1995-03-16 22:34:51 +00:00
|
|
|
(eq frame-B (or frame-C orig-frame))
|
1996-06-22 01:54:34 +00:00
|
|
|
;; A or B is not visible
|
1995-06-05 23:42:53 +00:00
|
|
|
(not (frame-live-p frame-A))
|
|
|
|
|
(not (frame-live-p frame-B))
|
1996-06-22 01:54:34 +00:00
|
|
|
;; A or B is not suitable for display
|
|
|
|
|
(not (ediff-window-ok-for-display wind-A))
|
|
|
|
|
(not (ediff-window-ok-for-display wind-B))
|
|
|
|
|
;; A and B in the same frame, and no good frame
|
|
|
|
|
;; for C
|
1995-06-05 23:42:53 +00:00
|
|
|
(and (eq frame-A frame-B)
|
|
|
|
|
(not (frame-live-p frame-C)))
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
1996-06-22 01:54:34 +00:00
|
|
|
;; use-same-frame-for-AB implies wind A and B are ok for display
|
1995-03-16 22:34:51 +00:00
|
|
|
(use-same-frame-for-AB (and (not use-same-frame)
|
|
|
|
|
(eq frame-A frame-B)))
|
2017-10-26 22:15:41 -04:00
|
|
|
(merge-window-share (with-current-buffer control-buf
|
1995-03-16 22:34:51 +00:00
|
|
|
ediff-merge-window-share))
|
|
|
|
|
merge-window-lines
|
2017-03-14 16:12:29 +09:00
|
|
|
designated-minibuffer-frame ; ediff-merge-with-ancestor-job
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-Ancestor-p (with-current-buffer control-buf
|
2017-03-14 16:12:29 +09:00
|
|
|
ediff-merge-with-ancestor-job))
|
|
|
|
|
(done-Ancestor (not with-Ancestor-p))
|
1995-03-16 22:34:51 +00:00
|
|
|
done-A done-B done-C)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; buf-A on its own
|
|
|
|
|
(if (and (window-live-p wind-A)
|
1996-06-22 01:54:34 +00:00
|
|
|
(null use-same-frame) ; implies wind-A is suitable
|
1995-03-16 22:34:51 +00:00
|
|
|
(null use-same-frame-for-AB))
|
2017-02-10 20:05:11 +09:00
|
|
|
(progn ; buf A on its own
|
1996-06-22 01:54:34 +00:00
|
|
|
;; buffer buf-A is seen in live wind-A
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window wind-A)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-A (selected-window))
|
|
|
|
|
(setq done-A t)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; buf-B on its own
|
1996-06-22 01:54:34 +00:00
|
|
|
(if (and (window-live-p wind-B)
|
|
|
|
|
(null use-same-frame) ; implies wind-B is suitable
|
|
|
|
|
(null use-same-frame-for-AB))
|
|
|
|
|
(progn ; buf B on its own
|
|
|
|
|
;; buffer buf-B is seen in live wind-B
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window wind-B)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-B (selected-window))
|
|
|
|
|
(setq done-B t)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; buf-C on its own
|
1996-06-22 01:54:34 +00:00
|
|
|
(if (and (window-live-p wind-C)
|
|
|
|
|
(ediff-window-ok-for-display wind-C)
|
|
|
|
|
(null use-same-frame)) ; buf C on its own
|
1995-03-16 22:34:51 +00:00
|
|
|
(progn
|
1996-06-22 01:54:34 +00:00
|
|
|
;; buffer buf-C is seen in live wind-C
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window wind-C)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-C (selected-window))
|
|
|
|
|
(setq done-C t)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-03-14 16:12:29 +09:00
|
|
|
;; buf-Ancestor on its own
|
|
|
|
|
(if (and ediff-show-ancestor
|
|
|
|
|
with-Ancestor-p
|
|
|
|
|
(window-live-p wind-Ancestor)
|
|
|
|
|
(ediff-window-ok-for-display wind-Ancestor)
|
|
|
|
|
(null use-same-frame)) ; buf Ancestor on its own
|
|
|
|
|
(progn
|
|
|
|
|
;; buffer buf-Ancestor is seen in live wind-Ancestor
|
|
|
|
|
(select-window wind-Ancestor)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-Ancestor (selected-window))
|
|
|
|
|
(setq done-Ancestor t)))
|
|
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(if (and use-same-frame-for-AB ; implies wind A and B are suitable
|
|
|
|
|
(window-live-p wind-A))
|
1999-12-18 16:14:32 +00:00
|
|
|
(progn
|
1996-06-22 01:54:34 +00:00
|
|
|
;; wind-A must already be displaying buf-A
|
|
|
|
|
(select-window wind-A)
|
1995-03-16 22:34:51 +00:00
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-A (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(funcall split-window-function)
|
1999-12-18 16:14:32 +00:00
|
|
|
(if (eq (selected-window) wind-A)
|
1995-03-16 22:34:51 +00:00
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-B)
|
|
|
|
|
(setq wind-B (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq done-A t
|
|
|
|
|
done-B t)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if use-same-frame
|
1996-06-22 01:54:34 +00:00
|
|
|
(let ((window-min-height 1))
|
1997-05-31 01:10:39 +00:00
|
|
|
(if (and (eq frame-A frame-B)
|
|
|
|
|
(eq frame-B frame-C)
|
2017-03-14 16:12:29 +09:00
|
|
|
(eq frame-C frame-Ancestor)
|
1997-05-31 01:10:39 +00:00
|
|
|
(frame-live-p frame-A))
|
|
|
|
|
(select-frame frame-A)
|
|
|
|
|
;; avoid dedicated and non-splittable windows
|
|
|
|
|
(ediff-skip-unsuitable-frames))
|
1995-03-16 22:34:51 +00:00
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq merge-window-lines
|
|
|
|
|
(max 2 (round (* (window-height) merge-window-share))))
|
|
|
|
|
(switch-to-buffer buf-A)
|
|
|
|
|
(setq wind-A (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(split-window-vertically
|
|
|
|
|
(max 2 (- (window-height) merge-window-lines)))
|
1999-12-18 16:14:32 +00:00
|
|
|
(if (eq (selected-window) wind-A)
|
1995-03-16 22:34:51 +00:00
|
|
|
(other-window 1))
|
|
|
|
|
(setq wind-C (selected-window))
|
|
|
|
|
(switch-to-buffer buf-C)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-03-14 16:12:29 +09:00
|
|
|
(when (and ediff-show-ancestor with-Ancestor-p)
|
|
|
|
|
(select-window wind-C)
|
|
|
|
|
(funcall split-window-function)
|
|
|
|
|
(if (eq (selected-window) wind-C)
|
|
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-Ancestor)
|
|
|
|
|
(setq wind-Ancestor (selected-window)))
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window wind-A)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(funcall split-window-function)
|
1999-12-18 16:14:32 +00:00
|
|
|
(if (eq (selected-window) wind-A)
|
1995-03-16 22:34:51 +00:00
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-B)
|
|
|
|
|
(setq wind-B (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq done-A t
|
|
|
|
|
done-B t
|
2017-03-14 16:12:29 +09:00
|
|
|
done-C t
|
|
|
|
|
done-Ancestor t)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(or done-A ; Buf A to be set in its own frame,
|
|
|
|
|
;;; or it was set before because use-same-frame = 1
|
|
|
|
|
(progn
|
|
|
|
|
;; Buf-A was not set up yet as it wasn't visible,
|
|
|
|
|
;; and use-same-frame = nil, use-same-frame-for-AB = nil
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window orig-wind)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-A)
|
|
|
|
|
(setq wind-A (selected-window))
|
|
|
|
|
))
|
1996-06-22 01:54:34 +00:00
|
|
|
(or done-B ; Buf B to be set in its own frame,
|
|
|
|
|
;;; or it was set before because use-same-frame = 1
|
|
|
|
|
(progn
|
|
|
|
|
;; Buf-B was not set up yet as it wasn't visible
|
|
|
|
|
;; and use-same-frame = nil, use-same-frame-for-AB = nil
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window orig-wind)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-B)
|
|
|
|
|
(setq wind-B (selected-window))
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(or done-C ; Buf C to be set in its own frame,
|
|
|
|
|
;;; or it was set before because use-same-frame = 1
|
|
|
|
|
(progn
|
|
|
|
|
;; Buf-C was not set up yet as it wasn't visible
|
|
|
|
|
;; and use-same-frame = nil
|
1995-03-16 22:34:51 +00:00
|
|
|
(select-window orig-wind)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-C)
|
|
|
|
|
(setq wind-C (selected-window))
|
|
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-03-14 16:12:29 +09:00
|
|
|
(or done-Ancestor ; Buf Ancestor to be set in its own frame,
|
|
|
|
|
(not ediff-show-ancestor)
|
|
|
|
|
;;; or it was set before because use-same-frame = 1
|
|
|
|
|
(progn
|
|
|
|
|
;; Buf-Ancestor was not set up yet as it wasn't visible
|
|
|
|
|
;; and use-same-frame = nil
|
|
|
|
|
(select-window orig-wind)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-Ancestor)
|
|
|
|
|
(setq wind-Ancestor (selected-window))))
|
|
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-window-A wind-A
|
|
|
|
|
ediff-window-B wind-B
|
2017-03-14 16:12:29 +09:00
|
|
|
ediff-window-C wind-C
|
|
|
|
|
ediff-window-Ancestor wind-Ancestor)
|
1995-06-05 23:42:53 +00:00
|
|
|
(setq frame-A (window-frame ediff-window-A)
|
|
|
|
|
designated-minibuffer-frame
|
|
|
|
|
(window-frame (minibuffer-window frame-A))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-06-05 23:42:53 +00:00
|
|
|
(ediff-setup-control-frame control-buf designated-minibuffer-frame)
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
|
|
|
|
|
|
|
|
|
;; Window setup for all comparison jobs, including 3way comparisons
|
|
|
|
|
(defun ediff-setup-windows-multiframe-compare (buf-A buf-B buf-C control-buf)
|
2017-10-26 22:15:41 -04:00
|
|
|
;; Algorithm:
|
|
|
|
|
;; If a buffer is seen in a frame, use that frame for that buffer.
|
|
|
|
|
;; If it is not seen, use the current frame.
|
|
|
|
|
;; If both buffers are not seen, they share the current frame. If one
|
|
|
|
|
;; of the buffers is not seen, it is placed in the current frame (where
|
|
|
|
|
;; ediff started). If that frame is displaying the other buffer, it is
|
|
|
|
|
;; shared between the two buffers.
|
|
|
|
|
;; However, if we decide to put both buffers in one frame
|
|
|
|
|
;; and the selected frame isn't splittable, we create a new frame and
|
|
|
|
|
;; put both buffers there, event if one of this buffers is visible in
|
|
|
|
|
;; another frame.
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
(let* ((window-min-height 1)
|
1995-03-16 22:34:51 +00:00
|
|
|
(wind-A (ediff-get-visible-buffer-window buf-A))
|
|
|
|
|
(wind-B (ediff-get-visible-buffer-window buf-B))
|
|
|
|
|
(wind-C (ediff-get-visible-buffer-window buf-C))
|
1995-06-05 23:42:53 +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)))
|
2017-10-26 22:15:41 -04:00
|
|
|
(ctl-frame-exists-p (with-current-buffer control-buf
|
1995-06-05 23:42:53 +00:00
|
|
|
(frame-live-p ediff-control-frame)))
|
1995-03-16 22:34:51 +00:00
|
|
|
;; on wide display, do things in one frame
|
1999-12-18 16:14:32 +00:00
|
|
|
(force-one-frame
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf ediff-wide-display-p))
|
1995-03-16 22:34:51 +00:00
|
|
|
;; this lets us have local versions of ediff-split-window-function
|
1999-12-18 16:14:32 +00:00
|
|
|
(split-window-function
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf ediff-split-window-function))
|
1995-03-16 22:34:51 +00:00
|
|
|
(three-way-comparison
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf ediff-3way-comparison-job))
|
1995-03-16 22:34:51 +00:00
|
|
|
(use-same-frame (or force-one-frame
|
|
|
|
|
(eq frame-A frame-B)
|
1996-06-22 01:54:34 +00:00
|
|
|
(not (ediff-window-ok-for-display wind-A))
|
|
|
|
|
(not (ediff-window-ok-for-display wind-B))
|
1995-03-16 22:34:51 +00:00
|
|
|
(if three-way-comparison
|
|
|
|
|
(or (eq frame-A frame-C)
|
|
|
|
|
(eq frame-B frame-C)
|
1996-06-22 01:54:34 +00:00
|
|
|
(not (ediff-window-ok-for-display wind-C))
|
1995-06-05 23:42:53 +00:00
|
|
|
(not (frame-live-p frame-A))
|
|
|
|
|
(not (frame-live-p frame-B))
|
|
|
|
|
(not (frame-live-p frame-C))))
|
|
|
|
|
(and (not (frame-live-p frame-B))
|
1995-03-16 22:34:51 +00:00
|
|
|
(or ctl-frame-exists-p
|
1995-06-05 23:42:53 +00:00
|
|
|
(eq frame-A (selected-frame))))
|
|
|
|
|
(and (not (frame-live-p frame-A))
|
1995-03-16 22:34:51 +00:00
|
|
|
(or ctl-frame-exists-p
|
1995-06-05 23:42:53 +00:00
|
|
|
(eq frame-B (selected-frame))))))
|
1999-12-18 16:14:32 +00:00
|
|
|
wind-A-start wind-B-start
|
2017-10-26 22:15:41 -04:00
|
|
|
designated-minibuffer-frame)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq wind-A-start (ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type
|
|
|
|
|
'A ediff-narrow-bounds))
|
|
|
|
|
wind-B-start (ediff-overlay-start
|
|
|
|
|
(ediff-get-value-according-to-buffer-type
|
1995-06-05 23:42:53 +00:00
|
|
|
'B ediff-narrow-bounds))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if use-same-frame
|
1996-06-22 01:54:34 +00:00
|
|
|
(let (wind-width-or-height) ; this affects 3way setups only
|
1997-05-31 01:10:39 +00:00
|
|
|
(if (and (eq frame-A frame-B) (frame-live-p frame-A))
|
|
|
|
|
(select-frame frame-A)
|
|
|
|
|
;; avoid dedicated and non-splittable windows
|
|
|
|
|
(ediff-skip-unsuitable-frames))
|
1995-03-16 22:34:51 +00:00
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-A)
|
|
|
|
|
(setq wind-A (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if three-way-comparison
|
|
|
|
|
(setq wind-width-or-height
|
|
|
|
|
(/
|
2017-10-26 22:15:41 -04:00
|
|
|
(if (eq split-window-function #'split-window-vertically)
|
1995-03-16 22:34:51 +00:00
|
|
|
(window-height wind-A)
|
|
|
|
|
(window-width wind-A))
|
|
|
|
|
3)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(funcall split-window-function wind-width-or-height)
|
1999-12-18 16:14:32 +00:00
|
|
|
(if (eq (selected-window) wind-A)
|
1995-03-16 22:34:51 +00:00
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-B)
|
|
|
|
|
(setq wind-B (selected-window))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if three-way-comparison
|
|
|
|
|
(progn
|
|
|
|
|
(funcall split-window-function) ; equally
|
|
|
|
|
(if (memq (selected-window) (list wind-A wind-B))
|
|
|
|
|
(other-window 1))
|
|
|
|
|
(switch-to-buffer buf-C)
|
2017-10-26 22:15:41 -04:00
|
|
|
(setq wind-C (selected-window)))))
|
|
|
|
|
|
|
|
|
|
(if (window-live-p wind-A) ; buf-A on its own
|
|
|
|
|
(progn
|
|
|
|
|
;; buffer buf-A is seen in live wind-A
|
|
|
|
|
(select-window wind-A) ; must be displaying buf-A
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-A (selected-window))) ;FIXME: Why?
|
|
|
|
|
;; Buf-A was not set up yet as it wasn't visible,
|
|
|
|
|
;; and use-same-frame = nil
|
|
|
|
|
;; Skip dedicated or iconified frames.
|
|
|
|
|
;; Unsplittable frames are taken care of later.
|
|
|
|
|
(ediff-skip-unsuitable-frames 'ok-unsplittable)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-A)
|
|
|
|
|
(setq wind-A (selected-window)))
|
|
|
|
|
|
|
|
|
|
(if (window-live-p wind-B) ; buf B on its own
|
|
|
|
|
(progn
|
|
|
|
|
;; buffer buf-B is seen in live wind-B
|
|
|
|
|
(select-window wind-B) ; must be displaying buf-B
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-B (selected-window))) ;FIXME: Why?
|
|
|
|
|
;; Buf-B was not set up yet as it wasn't visible,
|
|
|
|
|
;; and use-same-frame = nil
|
|
|
|
|
;; Skip dedicated or iconified frames.
|
|
|
|
|
;; Unsplittable frames are taken care of later.
|
|
|
|
|
(ediff-skip-unsuitable-frames 'ok-unsplittable)
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-B)
|
|
|
|
|
(setq wind-B (selected-window)))
|
|
|
|
|
|
|
|
|
|
(if (window-live-p wind-C) ; buf C on its own
|
|
|
|
|
(progn
|
|
|
|
|
;; buffer buf-C is seen in live wind-C
|
|
|
|
|
(select-window wind-C) ; must be displaying buf-C
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(setq wind-C (selected-window))) ;FIXME: Why?
|
|
|
|
|
(if three-way-comparison
|
1999-12-18 16:14:32 +00:00
|
|
|
(progn
|
1996-06-22 01:54:34 +00:00
|
|
|
;; Buf-C was not set up yet as it wasn't visible,
|
|
|
|
|
;; and use-same-frame = nil
|
2017-10-26 22:15:41 -04:00
|
|
|
;; Skip dedicated or iconified frames.
|
|
|
|
|
;; Unsplittable frames are taken care of later.
|
|
|
|
|
(ediff-skip-unsuitable-frames 'ok-unsplittable)
|
1995-03-16 22:34:51 +00:00
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer buf-C)
|
|
|
|
|
(setq wind-C (selected-window))
|
2017-10-26 22:15:41 -04:00
|
|
|
))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer control-buf
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-window-A wind-A
|
|
|
|
|
ediff-window-B wind-B
|
|
|
|
|
ediff-window-C wind-C)
|
2002-10-12 07:13:59 +00:00
|
|
|
|
1995-06-05 23:42:53 +00:00
|
|
|
(setq frame-A (window-frame ediff-window-A)
|
|
|
|
|
designated-minibuffer-frame
|
|
|
|
|
(window-frame (minibuffer-window frame-A))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;; It is unlikely that we'll implement a version of ediff-windows that
|
1999-11-01 07:16:15 +00:00
|
|
|
;; would compare 3 windows at once. So, we don't use buffer C here.
|
1995-06-05 23:42:53 +00:00
|
|
|
(if ediff-windows-job
|
1995-03-16 22:34:51 +00:00
|
|
|
(progn
|
|
|
|
|
(set-window-start wind-A wind-A-start)
|
|
|
|
|
(set-window-start wind-B wind-B-start)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-06-05 23:42:53 +00:00
|
|
|
(ediff-setup-control-frame control-buf designated-minibuffer-frame)
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defun ediff-skip-unsuitable-frames (&optional ok-unsplittable)
|
2017-10-26 22:15:41 -04:00
|
|
|
"Skip unsplittable frames and frames that have dedicated windows.
|
|
|
|
|
create a new splittable frame if none is found."
|
1995-06-05 23:42:53 +00:00
|
|
|
(if (ediff-window-display-p)
|
Do not call to `selected-window' where it is assumed by default.
Affected functions are `window-minibuffer-p', `window-dedicated-p',
`window-hscroll', `window-width', `window-height', `window-buffer',
`window-frame', `window-start', `window-point', `next-window'
and `window-display-table'.
* abbrev.el (abbrev--default-expand):
* bs.el (bs--show-with-configuration):
* buff-menu.el (Buffer-menu-mouse-select):
* calc/calc.el (calc):
* calendar/calendar.el (calendar-generate-window):
* calendar/diary-lib.el (diary-simple-display, diary-show-all-entries)
(diary-make-entry):
* comint.el (send-invisible, comint-dynamic-complete-filename)
(comint-dynamic-simple-complete, comint-dynamic-list-completions):
* completion.el (complete):
* dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list):
* disp-table.el (describe-current-display-table):
* doc-view.el (doc-view-insert-image):
* ebuff-menu.el (Electric-buffer-menu-mouse-select):
* ehelp.el (with-electric-help):
* emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer):
* emacs-lisp/helper.el (Helper-help-scroller):
* emulation/cua-base.el (cua--post-command-handler-1):
* eshell/esh-mode.el (eshell-output-filter):
* ffap.el (ffap-gnus-wrapper):
* help-macro.el (make-help-screen):
* hilit-chg.el (highlight-compare-buffers):
* hippie-exp.el (hippie-expand, try-expand-dabbrev-visible):
* hl-line.el (global-hl-line-highlight):
* icomplete.el (icomplete-simple-completing-p):
* isearch.el (isearch-done):
* jit-lock.el (jit-lock-stealth-fontify):
* mail/rmailsum.el (rmail-summary-scroll-msg-up):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* mpc.el (mpc-tagbrowser, mpc):
* net/rcirc.el (rcirc-any-buffer):
* play/gomoku.el (gomoku-max-width, gomoku-max-height):
* play/landmark.el (landmark-max-width, landmark-max-height):
* play/zone.el (zone):
* progmodes/compile.el (compilation-goto-locus):
* progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern):
* progmodes/etags.el (find-tag-other-window):
* progmodes/fortran.el (fortran-column-ruler):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/verilog-mode.el (verilog-point-text):
* reposition.el (reposition-window):
* rot13.el (toggle-rot13-mode):
* server.el (server-switch-buffer):
* shell.el (shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable):
* simple.el (insert-buffer, set-selective-display)
(delete-completion-window):
* speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly)
(speedbar-recenter):
* startup.el (fancy-splash-head):
* textmodes/ispell.el (ispell-command-loop):
* textmodes/makeinfo.el (makeinfo-compilation-sentinel-region):
* tutorial.el (help-with-tutorial):
* vc/add-log.el (add-change-log-entry):
* vc/compare-w.el (compare-windows):
* vc/ediff-help.el (ediff-indent-help-message):
* vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region):
* vc/ediff-wind.el (ediff-skip-unsuitable-frames)
(ediff-setup-control-frame):
* vc/emerge.el (emerge-position-region):
* vc/pcvs-util.el (cvs-bury-buffer):
* window.el (walk-windows, mouse-autoselect-window-select):
* winner.el (winner-set-conf, winner-undo): Related users changed.
2013-08-05 18:26:57 +04:00
|
|
|
(let ((wind-frame (window-frame))
|
2002-10-12 07:13:59 +00:00
|
|
|
seen-windows)
|
2000-10-29 04:56:45 +00:00
|
|
|
(while (and (not (memq (selected-window) seen-windows))
|
1995-03-16 22:34:51 +00:00
|
|
|
(or
|
2002-10-12 07:13:59 +00:00
|
|
|
(ediff-frame-has-dedicated-windows wind-frame)
|
|
|
|
|
(ediff-frame-iconified-p wind-frame)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; skip small windows
|
2002-10-12 07:13:59 +00:00
|
|
|
(< (frame-height wind-frame)
|
1999-11-01 07:16:15 +00:00
|
|
|
(* 3 window-min-height))
|
1995-03-16 22:34:51 +00:00
|
|
|
(if ok-unsplittable
|
|
|
|
|
nil
|
2002-10-12 07:13:59 +00:00
|
|
|
(ediff-frame-unsplittable-p wind-frame))))
|
|
|
|
|
;; remember history
|
2000-10-29 04:56:45 +00:00
|
|
|
(setq seen-windows (cons (selected-window) seen-windows))
|
1995-03-16 22:34:51 +00:00
|
|
|
;; try new window
|
2002-10-12 07:13:59 +00:00
|
|
|
(other-window 1 t)
|
Do not call to `selected-window' where it is assumed by default.
Affected functions are `window-minibuffer-p', `window-dedicated-p',
`window-hscroll', `window-width', `window-height', `window-buffer',
`window-frame', `window-start', `window-point', `next-window'
and `window-display-table'.
* abbrev.el (abbrev--default-expand):
* bs.el (bs--show-with-configuration):
* buff-menu.el (Buffer-menu-mouse-select):
* calc/calc.el (calc):
* calendar/calendar.el (calendar-generate-window):
* calendar/diary-lib.el (diary-simple-display, diary-show-all-entries)
(diary-make-entry):
* comint.el (send-invisible, comint-dynamic-complete-filename)
(comint-dynamic-simple-complete, comint-dynamic-list-completions):
* completion.el (complete):
* dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list):
* disp-table.el (describe-current-display-table):
* doc-view.el (doc-view-insert-image):
* ebuff-menu.el (Electric-buffer-menu-mouse-select):
* ehelp.el (with-electric-help):
* emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer):
* emacs-lisp/helper.el (Helper-help-scroller):
* emulation/cua-base.el (cua--post-command-handler-1):
* eshell/esh-mode.el (eshell-output-filter):
* ffap.el (ffap-gnus-wrapper):
* help-macro.el (make-help-screen):
* hilit-chg.el (highlight-compare-buffers):
* hippie-exp.el (hippie-expand, try-expand-dabbrev-visible):
* hl-line.el (global-hl-line-highlight):
* icomplete.el (icomplete-simple-completing-p):
* isearch.el (isearch-done):
* jit-lock.el (jit-lock-stealth-fontify):
* mail/rmailsum.el (rmail-summary-scroll-msg-up):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* mpc.el (mpc-tagbrowser, mpc):
* net/rcirc.el (rcirc-any-buffer):
* play/gomoku.el (gomoku-max-width, gomoku-max-height):
* play/landmark.el (landmark-max-width, landmark-max-height):
* play/zone.el (zone):
* progmodes/compile.el (compilation-goto-locus):
* progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern):
* progmodes/etags.el (find-tag-other-window):
* progmodes/fortran.el (fortran-column-ruler):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/verilog-mode.el (verilog-point-text):
* reposition.el (reposition-window):
* rot13.el (toggle-rot13-mode):
* server.el (server-switch-buffer):
* shell.el (shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable):
* simple.el (insert-buffer, set-selective-display)
(delete-completion-window):
* speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly)
(speedbar-recenter):
* startup.el (fancy-splash-head):
* textmodes/ispell.el (ispell-command-loop):
* textmodes/makeinfo.el (makeinfo-compilation-sentinel-region):
* tutorial.el (help-with-tutorial):
* vc/add-log.el (add-change-log-entry):
* vc/compare-w.el (compare-windows):
* vc/ediff-help.el (ediff-indent-help-message):
* vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region):
* vc/ediff-wind.el (ediff-skip-unsuitable-frames)
(ediff-setup-control-frame):
* vc/emerge.el (emerge-position-region):
* vc/pcvs-util.el (cvs-bury-buffer):
* window.el (walk-windows, mouse-autoselect-window-select):
* winner.el (winner-set-conf, winner-undo): Related users changed.
2013-08-05 18:26:57 +04:00
|
|
|
(setq wind-frame (window-frame))
|
2002-10-12 07:13:59 +00:00
|
|
|
)
|
2000-10-29 04:56:45 +00:00
|
|
|
(if (memq (selected-window) seen-windows)
|
2002-10-12 07:13:59 +00:00
|
|
|
;; fed up, no appropriate frames
|
|
|
|
|
(setq wind-frame (make-frame '((unsplittable)))))
|
|
|
|
|
|
|
|
|
|
(select-frame wind-frame)
|
|
|
|
|
)))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(defun ediff-frame-has-dedicated-windows (frame)
|
2002-10-12 07:13:59 +00:00
|
|
|
(let (ans)
|
2003-02-04 11:26:42 +00:00
|
|
|
(walk-windows
|
1999-11-01 07:16:15 +00:00
|
|
|
(lambda (wind) (if (window-dedicated-p wind)
|
|
|
|
|
(setq ans t)))
|
1996-06-22 01:54:34 +00:00
|
|
|
'ignore-minibuffer
|
|
|
|
|
frame)
|
|
|
|
|
ans))
|
|
|
|
|
|
|
|
|
|
;; window is ok, if it is only one window on the frame, not counting the
|
|
|
|
|
;; minibuffer, or none of the frame's windows is dedicated.
|
|
|
|
|
;; The idea is that it is bad to destroy dedicated windows while creating an
|
|
|
|
|
;; ediff window setup
|
|
|
|
|
(defun ediff-window-ok-for-display (wind)
|
|
|
|
|
(and
|
|
|
|
|
(window-live-p wind)
|
1999-12-18 16:14:32 +00:00
|
|
|
(or
|
1996-06-22 01:54:34 +00:00
|
|
|
;; only one window
|
|
|
|
|
(eq wind (next-window wind 'ignore-minibuffer (window-frame wind)))
|
2008-04-04 07:51:27 +00:00
|
|
|
;; none is dedicated (in multiframe setup)
|
1996-06-22 01:54:34 +00:00
|
|
|
(not (ediff-frame-has-dedicated-windows (window-frame wind)))
|
|
|
|
|
)))
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Prepare or refresh control frame
|
1995-06-05 23:42:53 +00:00
|
|
|
(defun ediff-setup-control-frame (ctl-buffer designated-minibuffer-frame)
|
1996-02-16 06:36:35 +00:00
|
|
|
(let ((window-min-height 1)
|
1995-03-16 22:34:51 +00:00
|
|
|
ctl-frame-iconified-p dont-iconify-ctl-frame deiconify-ctl-frame
|
1999-12-18 16:14:32 +00:00
|
|
|
ctl-frame old-ctl-frame lines
|
1996-06-22 01:54:34 +00:00
|
|
|
;; user-grabbed-mouse
|
1999-12-18 16:14:32 +00:00
|
|
|
fheight fwidth adjusted-parameters)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer ctl-buffer
|
1995-10-06 01:00:10 +00:00
|
|
|
;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
|
|
|
|
|
(run-hooks 'ediff-before-setup-control-frame-hook))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(setq old-ctl-frame (with-current-buffer ctl-buffer ediff-control-frame))
|
|
|
|
|
(with-current-buffer ctl-buffer
|
1996-02-16 06:36:35 +00:00
|
|
|
(setq ctl-frame (if (frame-live-p old-ctl-frame)
|
|
|
|
|
old-ctl-frame
|
|
|
|
|
(make-frame ediff-control-frame-parameters))
|
2000-06-28 20:19:18 +00:00
|
|
|
ediff-control-frame ctl-frame)
|
2000-10-30 02:16:11 +00:00
|
|
|
;; protect against undefined face-attribute
|
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
|
|
|
(condition-case nil
|
Remove some XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-goto-word): Ditto.
* lisp/vc/ediff-init.el (ediff-has-face-support-p)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-current-diff-Ancestor)
(ediff-fine-diff-A, ediff-fine-diff-B, ediff-fine-diff-C)
(ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C)
(ediff-even-diff-Ancestor, ediff-odd-diff-A, ediff-odd-diff-B)
(ediff-odd-diff-C, ediff-odd-diff-Ancestor)
(ediff-with-syntax-table): Ditto.
* lisp/vc/ediff-mult.el (ediff-dir-diffs-buffer-map)
(ediff-setup-meta-map, ediff-set-meta-overlay): Ditto.
* lisp/vc/ediff-util.el (ediff-setup-keymap)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-make-bullet-proof-overlay): Ditto.
* lisp/vc/ediff-wind.el (ediff-setup-control-frame)
(ediff-refresh-control-frame): Remove XEmacs compat code.
2019-10-04 15:20:41 +02:00
|
|
|
(if (face-attribute 'mode-line :box)
|
2008-04-04 07:51:27 +00:00
|
|
|
(set-face-attribute 'mode-line ctl-frame :box nil))
|
2008-03-05 08:53:30 +00:00
|
|
|
(error)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame))
|
1995-06-05 23:42:53 +00:00
|
|
|
(select-frame ctl-frame)
|
Do not call to `selected-window' where it is assumed by default.
Affected functions are `window-minibuffer-p', `window-dedicated-p',
`window-hscroll', `window-width', `window-height', `window-buffer',
`window-frame', `window-start', `window-point', `next-window'
and `window-display-table'.
* abbrev.el (abbrev--default-expand):
* bs.el (bs--show-with-configuration):
* buff-menu.el (Buffer-menu-mouse-select):
* calc/calc.el (calc):
* calendar/calendar.el (calendar-generate-window):
* calendar/diary-lib.el (diary-simple-display, diary-show-all-entries)
(diary-make-entry):
* comint.el (send-invisible, comint-dynamic-complete-filename)
(comint-dynamic-simple-complete, comint-dynamic-list-completions):
* completion.el (complete):
* dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list):
* disp-table.el (describe-current-display-table):
* doc-view.el (doc-view-insert-image):
* ebuff-menu.el (Electric-buffer-menu-mouse-select):
* ehelp.el (with-electric-help):
* emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer):
* emacs-lisp/helper.el (Helper-help-scroller):
* emulation/cua-base.el (cua--post-command-handler-1):
* eshell/esh-mode.el (eshell-output-filter):
* ffap.el (ffap-gnus-wrapper):
* help-macro.el (make-help-screen):
* hilit-chg.el (highlight-compare-buffers):
* hippie-exp.el (hippie-expand, try-expand-dabbrev-visible):
* hl-line.el (global-hl-line-highlight):
* icomplete.el (icomplete-simple-completing-p):
* isearch.el (isearch-done):
* jit-lock.el (jit-lock-stealth-fontify):
* mail/rmailsum.el (rmail-summary-scroll-msg-up):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* mpc.el (mpc-tagbrowser, mpc):
* net/rcirc.el (rcirc-any-buffer):
* play/gomoku.el (gomoku-max-width, gomoku-max-height):
* play/landmark.el (landmark-max-width, landmark-max-height):
* play/zone.el (zone):
* progmodes/compile.el (compilation-goto-locus):
* progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern):
* progmodes/etags.el (find-tag-other-window):
* progmodes/fortran.el (fortran-column-ruler):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/verilog-mode.el (verilog-point-text):
* reposition.el (reposition-window):
* rot13.el (toggle-rot13-mode):
* server.el (server-switch-buffer):
* shell.el (shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable):
* simple.el (insert-buffer, set-selective-display)
(delete-completion-window):
* speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly)
(speedbar-recenter):
* startup.el (fancy-splash-head):
* textmodes/ispell.el (ispell-command-loop):
* textmodes/makeinfo.el (makeinfo-compilation-sentinel-region):
* tutorial.el (help-with-tutorial):
* vc/add-log.el (add-change-log-entry):
* vc/compare-w.el (compare-windows):
* vc/ediff-help.el (ediff-indent-help-message):
* vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region):
* vc/ediff-wind.el (ediff-skip-unsuitable-frames)
(ediff-setup-control-frame):
* vc/emerge.el (emerge-position-region):
* vc/pcvs-util.el (cvs-bury-buffer):
* window.el (walk-windows, mouse-autoselect-window-select):
* winner.el (winner-set-conf, winner-undo): Related users changed.
2013-08-05 18:26:57 +04:00
|
|
|
(if (window-dedicated-p)
|
1995-03-16 22:34:51 +00:00
|
|
|
()
|
|
|
|
|
(delete-other-windows)
|
|
|
|
|
(switch-to-buffer ctl-buffer))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; must be before ediff-setup-control-buffer
|
1995-10-06 01:00:10 +00:00
|
|
|
;; just a precaution--we should be in ctl-buffer already
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer ctl-buffer
|
1995-10-06 01:00:10 +00:00
|
|
|
(make-local-variable 'frame-title-format)
|
2020-03-21 07:59:05 +01:00
|
|
|
(make-local-variable 'icon-title-format))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-setup-control-buffer ctl-buffer)
|
|
|
|
|
(setq dont-iconify-ctl-frame
|
|
|
|
|
(not (string= ediff-help-message ediff-brief-help-message)))
|
1999-12-18 16:14:32 +00:00
|
|
|
(setq deiconify-ctl-frame
|
1995-03-16 22:34:51 +00:00
|
|
|
(and (eq this-command 'ediff-toggle-help)
|
|
|
|
|
dont-iconify-ctl-frame))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2012-06-02 18:56:09 +08:00
|
|
|
;; 1 more line for the mode line
|
1996-02-16 06:36:35 +00:00
|
|
|
(setq lines (1+ (count-lines (point-min) (point-max)))
|
1995-03-16 22:34:51 +00:00
|
|
|
fheight lines
|
2020-11-20 16:19:14 +01:00
|
|
|
fwidth (max (+ (ediff-help-message-line-length) 2) 0)
|
1997-05-31 01:10:39 +00:00
|
|
|
adjusted-parameters
|
|
|
|
|
(list
|
|
|
|
|
;; possibly change surrogate minibuffer
|
|
|
|
|
(cons 'minibuffer
|
|
|
|
|
(minibuffer-window
|
|
|
|
|
designated-minibuffer-frame))
|
|
|
|
|
(cons 'width fwidth)
|
2005-11-29 06:12:52 +00:00
|
|
|
(cons 'height fheight)
|
|
|
|
|
(cons 'user-position t)
|
|
|
|
|
))
|
2002-10-12 07:13:59 +00:00
|
|
|
|
|
|
|
|
;; adjust autoraise
|
|
|
|
|
(setq adjusted-parameters
|
|
|
|
|
(cons (if ediff-use-long-help-message
|
|
|
|
|
'(auto-raise . nil)
|
|
|
|
|
'(auto-raise . t))
|
|
|
|
|
adjusted-parameters))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2010-10-08 00:51:19 -07:00
|
|
|
;; As a precaution, we call modify frame parameters twice, in
|
|
|
|
|
;; order to make sure that at least once we do it for
|
|
|
|
|
;; a non-iconified frame. (It appears that in the Windows port of
|
|
|
|
|
;; Emacs, one can't modify frame parameters of iconified frames.)
|
|
|
|
|
(if (eq system-type 'windows-nt)
|
1995-06-05 23:42:53 +00:00
|
|
|
(modify-frame-parameters ctl-frame adjusted-parameters))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
1995-10-06 01:00:10 +00:00
|
|
|
(modify-frame-parameters ctl-frame adjusted-parameters)
|
1996-06-22 01:54:34 +00:00
|
|
|
(make-frame-visible ctl-frame)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
;; This works around a bug in 19.25 and earlier. There, if frame gets
|
1995-03-16 22:34:51 +00:00
|
|
|
;; iconified, the current buffer changes to that of the frame that
|
|
|
|
|
;; becomes exposed as a result of this iconification.
|
|
|
|
|
;; So, we make sure the current buffer doesn't change.
|
1995-06-05 23:42:53 +00:00
|
|
|
(select-frame ctl-frame)
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-refresh-control-frame)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-10-06 01:00:10 +00:00
|
|
|
(cond ((and ediff-prefer-iconified-control-frame
|
|
|
|
|
(not ctl-frame-iconified-p) (not dont-iconify-ctl-frame))
|
|
|
|
|
(iconify-frame ctl-frame))
|
|
|
|
|
((or deiconify-ctl-frame (not ctl-frame-iconified-p))
|
|
|
|
|
(raise-frame ctl-frame)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(set-window-dedicated-p (selected-window) t)
|
1997-05-31 01:10:39 +00:00
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
;; Now move the frame. We must do it separately due to an obscure bug in
|
1997-05-31 01:10:39 +00:00
|
|
|
;; XEmacs
|
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
ctl-frame
|
|
|
|
|
(funcall ediff-control-frame-position-function ctl-buffer fwidth fheight))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;; synchronize so the cursor will move to control frame
|
1995-10-06 01:00:10 +00:00
|
|
|
;; per RMS suggestion
|
1996-02-16 06:36:35 +00:00
|
|
|
(if (ediff-window-display-p)
|
|
|
|
|
(let ((count 7))
|
|
|
|
|
(sit-for .1)
|
|
|
|
|
(while (and (not (frame-visible-p ctl-frame)) (> count 0))
|
|
|
|
|
(setq count (1- count))
|
|
|
|
|
(sit-for .3))))
|
1995-10-06 01:00:10 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(or (ediff-frame-iconified-p ctl-frame)
|
1995-10-06 01:00:10 +00:00
|
|
|
;; don't warp the mouse, unless ediff-grab-mouse = t
|
1996-02-16 06:36:35 +00:00
|
|
|
(ediff-reset-mouse ctl-frame
|
|
|
|
|
(or (eq this-command 'ediff-quit)
|
|
|
|
|
(not (eq ediff-grab-mouse t)))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer ctl-buffer
|
2008-03-05 08:53:30 +00:00
|
|
|
(run-hooks 'ediff-after-setup-control-frame-hook))))
|
1997-05-31 01:10:39 +00:00
|
|
|
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-06-05 23:42:53 +00:00
|
|
|
(defun ediff-destroy-control-frame (ctl-buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer ctl-buffer
|
1995-06-05 23:42:53 +00:00
|
|
|
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
|
|
|
|
|
(let ((ctl-frame ediff-control-frame))
|
|
|
|
|
(setq ediff-control-frame nil)
|
2008-03-05 08:53:30 +00:00
|
|
|
(delete-frame ctl-frame))))
|
2008-04-04 07:51:27 +00:00
|
|
|
(if ediff-multiframe
|
|
|
|
|
(ediff-skip-unsuitable-frames))
|
1995-10-06 01:00:10 +00:00
|
|
|
;;(ediff-reset-mouse nil)
|
|
|
|
|
)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; finds a good place to clip control frame
|
|
|
|
|
(defun ediff-make-frame-position (ctl-buffer ctl-frame-width ctl-frame-height)
|
2017-10-26 22:15:41 -04:00
|
|
|
(with-current-buffer ctl-buffer
|
1995-06-05 23:42:53 +00:00
|
|
|
(let* ((frame-A (window-frame ediff-window-A))
|
|
|
|
|
(frame-A-parameters (frame-parameters frame-A))
|
2021-02-26 16:51:15 -05:00
|
|
|
(frame-A-top (eval (cdr (assoc 'top frame-A-parameters)) t))
|
|
|
|
|
(frame-A-left (eval (cdr (assoc 'left frame-A-parameters)) t))
|
1995-06-05 23:42:53 +00:00
|
|
|
(frame-A-width (frame-width frame-A))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ctl-frame ediff-control-frame)
|
|
|
|
|
horizontal-adjustment upward-adjustment
|
1999-12-18 16:14:32 +00:00
|
|
|
ctl-frame-top ctl-frame-left)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Multiple control frames are clipped based on the value of
|
1999-11-01 07:16:15 +00:00
|
|
|
;; ediff-control-buffer-number. This is done in order not to obscure
|
1995-03-16 22:34:51 +00:00
|
|
|
;; other active control panels.
|
|
|
|
|
(setq horizontal-adjustment (* 2 ediff-control-buffer-number)
|
|
|
|
|
upward-adjustment (* -14 ediff-control-buffer-number))
|
|
|
|
|
|
1995-10-06 01:00:10 +00:00
|
|
|
(setq ctl-frame-top
|
|
|
|
|
(- frame-A-top upward-adjustment ediff-control-frame-upward-shift)
|
|
|
|
|
ctl-frame-left
|
|
|
|
|
(+ frame-A-left
|
1996-02-16 06:36:35 +00:00
|
|
|
(if ediff-use-long-help-message
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(* (frame-char-width ctl-frame)
|
1995-10-06 01:00:10 +00:00
|
|
|
(+ ediff-wide-control-frame-rightward-shift
|
|
|
|
|
horizontal-adjustment))
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(- (* frame-A-width (frame-char-width frame-A))
|
|
|
|
|
(* (frame-char-width ctl-frame)
|
1995-10-06 01:00:10 +00:00
|
|
|
(+ ctl-frame-width
|
|
|
|
|
ediff-narrow-control-frame-leftward-shift
|
|
|
|
|
horizontal-adjustment))))))
|
|
|
|
|
(setq ctl-frame-top
|
|
|
|
|
(min ctl-frame-top
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(- (display-pixel-height)
|
1995-10-06 01:00:10 +00:00
|
|
|
(* 2 ctl-frame-height
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(frame-char-height ctl-frame))))
|
1995-10-06 01:00:10 +00:00
|
|
|
ctl-frame-left
|
|
|
|
|
(min ctl-frame-left
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(- (display-pixel-width)
|
|
|
|
|
(* ctl-frame-width (frame-char-width ctl-frame)))))
|
1996-02-16 06:36:35 +00:00
|
|
|
;; keep ctl frame within the visible bounds
|
|
|
|
|
(setq ctl-frame-top (max ctl-frame-top 1)
|
|
|
|
|
ctl-frame-left (max ctl-frame-left 1))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-10-06 01:00:10 +00:00
|
|
|
(list (cons 'top ctl-frame-top)
|
|
|
|
|
(cons 'left ctl-frame-left))
|
|
|
|
|
)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-06-05 23:42:53 +00:00
|
|
|
(defun ediff-xemacs-select-frame-hook ()
|
2020-03-21 07:59:05 +01:00
|
|
|
(declare (obsolete nil "28.1"))
|
1995-10-06 01:00:10 +00:00
|
|
|
(if (and (equal (selected-frame) ediff-control-frame)
|
1996-02-16 06:36:35 +00:00
|
|
|
(not ediff-use-long-help-message))
|
1995-06-05 23:42:53 +00:00
|
|
|
(raise-frame ediff-control-frame)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-make-wide-display ()
|
|
|
|
|
"Construct an alist of parameters for the wide display.
|
|
|
|
|
Saves the old frame parameters in `ediff-wide-display-orig-parameters'.
|
|
|
|
|
The frame to be resized is kept in `ediff-wide-display-frame'.
|
|
|
|
|
This function modifies only the left margin and the width of the display.
|
|
|
|
|
It assumes that it is called from within the control buffer."
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(if (not (fboundp 'display-pixel-width))
|
ediff: use user-error rather than debug-ignored-errors
* lisp/vc/ediff-diff.el (ediff-prepare-error-list):
* lisp/vc/ediff-help.el (ediff-help-for-quick-help):
* lisp/vc/ediff-init.el (ediff-barf-if-not-control-buffer)
(ediff-check-version):
* lisp/vc/ediff-merg.el (ediff-shrink-window-C):
* lisp/vc/ediff-mult.el (ediff-draw-dir-diffs, ediff-show-dir-diffs)
(ediff-append-custom-diff, ediff-meta-show-patch)
(ediff-filegroup-action, ediff-show-meta-buffer, ediff-show-registry)
(ediff-get-meta-info, ediff-patch-file-form-meta):
* lisp/vc/ediff-ptch.el (ediff-patch-file-internal):
* lisp/vc/ediff-util.el (ediff-toggle-autorefine)
(ediff--check-ancestor-exists, ediff-toggle-read-only)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-toggle-show-clashes-only)
(ediff-next-difference, ediff-previous-difference)
(ediff-pop-diff, ediff-read-file-name, ediff-verify-file-buffer)
(ediff-save-buffer):
* lisp/vc/ediff-wind.el (ediff-make-wide-display):
* lisp/vc/ediff.el (ediff-find-file, ediff-buffers-internal)
(ediff-directories-internal, ediff-directory-revisions-internal)
(ediff-regions-wordwise, ediff-regions-linewise)
(ediff-load-version-control): Use user-error.
(debug-ignored-errors): No longer modify.
2017-04-17 20:16:15 -04:00
|
|
|
(user-error "Can't determine display width"))
|
1995-06-05 23:42:53 +00:00
|
|
|
(let* ((frame-A (window-frame ediff-window-A))
|
|
|
|
|
(frame-A-params (frame-parameters frame-A))
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(cw (frame-char-width frame-A))
|
|
|
|
|
(wd (- (/ (display-pixel-width) cw) 5)))
|
1999-12-18 16:14:32 +00:00
|
|
|
(setq ediff-wide-display-orig-parameters
|
2021-02-26 16:51:15 -05:00
|
|
|
(list (cons 'left (max 0 (eval (cdr (assoc 'left frame-A-params)) t)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(cons 'width (cdr (assoc 'width frame-A-params))))
|
|
|
|
|
ediff-wide-display-frame frame-A)
|
2005-11-29 06:12:52 +00:00
|
|
|
(modify-frame-parameters
|
2009-04-16 03:50:30 +00:00
|
|
|
frame-A `((left . ,cw) (width . ,wd) (user-position . t)))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
;; Revise the mode line to display which difference we have selected
|
2012-06-02 18:56:09 +08:00
|
|
|
;; Also resets mode lines of buffers A/B, since they may be clobbered by
|
2011-11-14 15:59:56 -08:00
|
|
|
;; other invocations of Ediff.
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-refresh-mode-lines ()
|
|
|
|
|
(let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (ediff-valid-difference-p)
|
|
|
|
|
(setq
|
|
|
|
|
buf-C-state-diff (ediff-get-state-of-diff ediff-current-difference 'C)
|
|
|
|
|
buf-C-state-merge (ediff-get-state-of-merge ediff-current-difference)
|
|
|
|
|
buf-A-state-diff (ediff-get-state-of-diff ediff-current-difference 'A)
|
|
|
|
|
buf-B-state-diff (ediff-get-state-of-diff ediff-current-difference 'B)
|
|
|
|
|
buf-A-state-diff (if buf-A-state-diff
|
|
|
|
|
(format "[%s] " buf-A-state-diff)
|
|
|
|
|
"")
|
|
|
|
|
buf-B-state-diff (if buf-B-state-diff
|
|
|
|
|
(format "[%s] " buf-B-state-diff)
|
|
|
|
|
"")
|
|
|
|
|
buf-C-state-diff (if (and (ediff-buffer-live-p ediff-buffer-C)
|
|
|
|
|
(or buf-C-state-diff buf-C-state-merge))
|
1995-10-06 01:00:10 +00:00
|
|
|
(format "[%s%s%s] "
|
1995-03-16 22:34:51 +00:00
|
|
|
(or buf-C-state-diff "")
|
|
|
|
|
(if buf-C-state-merge
|
|
|
|
|
(concat " " buf-C-state-merge)
|
1995-10-06 01:00:10 +00:00
|
|
|
"")
|
1999-12-18 16:14:32 +00:00
|
|
|
(if (ediff-get-state-of-ancestor
|
1995-10-06 01:00:10 +00:00
|
|
|
ediff-current-difference)
|
|
|
|
|
" AncestorEmpty"
|
|
|
|
|
"")
|
|
|
|
|
)
|
1995-03-16 22:34:51 +00:00
|
|
|
""))
|
|
|
|
|
(setq buf-A-state-diff ""
|
|
|
|
|
buf-B-state-diff ""
|
|
|
|
|
buf-C-state-diff ""))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; control buffer format
|
|
|
|
|
(setq mode-line-format
|
1997-05-31 01:10:39 +00:00
|
|
|
(if (ediff-narrow-control-frame-p)
|
|
|
|
|
(list " " mode-line-buffer-identification)
|
|
|
|
|
(list "-- " mode-line-buffer-identification " Quick Help")))
|
1995-03-16 22:34:51 +00:00
|
|
|
;; control buffer id
|
1999-12-18 16:14:32 +00:00
|
|
|
(setq mode-line-buffer-identification
|
1995-03-16 22:34:51 +00:00
|
|
|
(if (ediff-narrow-control-frame-p)
|
|
|
|
|
(ediff-make-narrow-control-buffer-id 'skip-name)
|
|
|
|
|
(ediff-make-wide-control-buffer-id)))
|
|
|
|
|
;; Force mode-line redisplay
|
|
|
|
|
(force-mode-line-update)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-06-05 23:42:53 +00:00
|
|
|
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-refresh-control-frame))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer ediff-buffer-A
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-diff-status buf-A-state-diff)
|
|
|
|
|
(ediff-strip-mode-line-format)
|
|
|
|
|
(setq mode-line-format
|
|
|
|
|
(list " A: " 'ediff-diff-status mode-line-format))
|
|
|
|
|
(force-mode-line-update))
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer ediff-buffer-B
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-diff-status buf-B-state-diff)
|
|
|
|
|
(ediff-strip-mode-line-format)
|
|
|
|
|
(setq mode-line-format
|
|
|
|
|
(list " B: " 'ediff-diff-status mode-line-format))
|
|
|
|
|
(force-mode-line-update))
|
|
|
|
|
(if ediff-3way-job
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer ediff-buffer-C
|
1995-03-16 22:34:51 +00:00
|
|
|
(setq ediff-diff-status buf-C-state-diff)
|
|
|
|
|
(ediff-strip-mode-line-format)
|
|
|
|
|
(setq mode-line-format
|
|
|
|
|
(list " C: " 'ediff-diff-status mode-line-format))
|
|
|
|
|
(force-mode-line-update)))
|
1995-10-06 01:00:10 +00:00
|
|
|
(if (ediff-buffer-live-p ediff-ancestor-buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer ediff-ancestor-buffer
|
1995-10-06 01:00:10 +00:00
|
|
|
(ediff-strip-mode-line-format)
|
|
|
|
|
;; we keep the second dummy string in the mode line format of the
|
|
|
|
|
;; ancestor, since for other buffers Ediff prepends 2 strings and
|
|
|
|
|
;; ediff-strip-mode-line-format expects that.
|
|
|
|
|
(setq mode-line-format
|
|
|
|
|
(list " Ancestor: "
|
|
|
|
|
(cond ((not (stringp buf-C-state-merge))
|
|
|
|
|
"")
|
|
|
|
|
((string-match "prefer-A" buf-C-state-merge)
|
|
|
|
|
"[=diff(B)] ")
|
|
|
|
|
((string-match "prefer-B" buf-C-state-merge)
|
|
|
|
|
"[=diff(A)] ")
|
|
|
|
|
(t ""))
|
|
|
|
|
mode-line-format))))
|
1995-03-16 22:34:51 +00:00
|
|
|
))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-refresh-control-frame ()
|
Remove some XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-goto-word): Ditto.
* lisp/vc/ediff-init.el (ediff-has-face-support-p)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-current-diff-Ancestor)
(ediff-fine-diff-A, ediff-fine-diff-B, ediff-fine-diff-C)
(ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C)
(ediff-even-diff-Ancestor, ediff-odd-diff-A, ediff-odd-diff-B)
(ediff-odd-diff-C, ediff-odd-diff-Ancestor)
(ediff-with-syntax-table): Ditto.
* lisp/vc/ediff-mult.el (ediff-dir-diffs-buffer-map)
(ediff-setup-meta-map, ediff-set-meta-overlay): Ditto.
* lisp/vc/ediff-util.el (ediff-setup-keymap)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-make-bullet-proof-overlay): Ditto.
* lisp/vc/ediff-wind.el (ediff-setup-control-frame)
(ediff-refresh-control-frame): Remove XEmacs compat code.
2019-10-04 15:20:41 +02:00
|
|
|
;; Set frame/icon titles.
|
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
ediff-control-frame
|
|
|
|
|
(list (cons 'title (ediff-make-base-title))
|
|
|
|
|
(cons 'icon-name (ediff-make-narrow-control-buffer-id)))))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-make-narrow-control-buffer-id (&optional skip-name)
|
|
|
|
|
(concat
|
|
|
|
|
(if skip-name
|
|
|
|
|
" "
|
1996-06-22 01:54:34 +00:00
|
|
|
(ediff-make-base-title))
|
1999-12-18 16:14:32 +00:00
|
|
|
(cond ((< ediff-current-difference 0)
|
1995-03-16 22:34:51 +00:00
|
|
|
(format " _/%d" ediff-number-of-differences))
|
|
|
|
|
((>= ediff-current-difference ediff-number-of-differences)
|
|
|
|
|
(format " $/%d" ediff-number-of-differences))
|
|
|
|
|
(t
|
|
|
|
|
(format " %d/%d"
|
|
|
|
|
(1+ ediff-current-difference)
|
|
|
|
|
ediff-number-of-differences)))))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
|
|
|
|
(defun ediff-make-base-title ()
|
|
|
|
|
(concat
|
|
|
|
|
(cdr (assoc 'name ediff-control-frame-parameters))
|
|
|
|
|
ediff-control-buffer-suffix))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-make-wide-control-buffer-id ()
|
|
|
|
|
(cond ((< ediff-current-difference 0)
|
|
|
|
|
(list (format "%%b At start of %d diffs"
|
|
|
|
|
ediff-number-of-differences)))
|
|
|
|
|
((>= ediff-current-difference ediff-number-of-differences)
|
|
|
|
|
(list (format "%%b At end of %d diffs"
|
|
|
|
|
ediff-number-of-differences)))
|
|
|
|
|
(t
|
|
|
|
|
(list (format "%%b diff %d of %d"
|
|
|
|
|
(1+ ediff-current-difference)
|
|
|
|
|
ediff-number-of-differences)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; If buff is not live, return nil
|
|
|
|
|
(defun ediff-get-visible-buffer-window (buff)
|
|
|
|
|
(if (ediff-buffer-live-p buff)
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(get-buffer-window buff 'visible)))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;;; Functions to decide when to redraw windows
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defun ediff-keep-window-config (control-buf)
|
|
|
|
|
(and (eq control-buf (current-buffer))
|
|
|
|
|
(/= (buffer-size) 0)
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-with-current-buffer control-buf
|
1995-03-16 22:34:51 +00:00
|
|
|
(let ((ctl-wind ediff-control-window)
|
|
|
|
|
(A-wind ediff-window-A)
|
|
|
|
|
(B-wind ediff-window-B)
|
2017-03-14 16:12:29 +09:00
|
|
|
(C-wind ediff-window-C)
|
|
|
|
|
(ancestor-job ediff-merge-with-ancestor-job)
|
|
|
|
|
(Ancestor-wind ediff-window-Ancestor))
|
2003-02-04 11:26:42 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(and
|
|
|
|
|
(ediff-window-visible-p A-wind)
|
|
|
|
|
(ediff-window-visible-p B-wind)
|
|
|
|
|
;; if buffer C is defined then take it into account
|
|
|
|
|
(or (not ediff-3way-job)
|
|
|
|
|
(ediff-window-visible-p C-wind))
|
2017-03-14 16:12:29 +09:00
|
|
|
(or (not ancestor-job)
|
|
|
|
|
(not ediff-show-ancestor)
|
|
|
|
|
(ediff-window-visible-p Ancestor-wind))
|
1995-03-16 22:34:51 +00:00
|
|
|
(eq (window-buffer A-wind) ediff-buffer-A)
|
|
|
|
|
(eq (window-buffer B-wind) ediff-buffer-B)
|
|
|
|
|
(or (not ediff-3way-job)
|
|
|
|
|
(eq (window-buffer C-wind) ediff-buffer-C))
|
2017-03-14 16:12:29 +09:00
|
|
|
(or (not ancestor-job)
|
|
|
|
|
(not ediff-show-ancestor)
|
|
|
|
|
(eq (window-buffer Ancestor-wind) ediff-ancestor-buffer))
|
1995-03-16 22:34:51 +00:00
|
|
|
(string= ediff-window-config-saved
|
2017-03-14 16:12:29 +09:00
|
|
|
(format "%S%S%S%S%S%S%S%S"
|
|
|
|
|
ctl-wind A-wind B-wind C-wind Ancestor-wind
|
1995-06-05 23:42:53 +00:00
|
|
|
ediff-split-window-function
|
|
|
|
|
(ediff-multiframe-setup-p)
|
|
|
|
|
ediff-wide-display-p)))))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2020-11-20 16:19:14 +01:00
|
|
|
(defun ediff-compute-toolbar-width ()
|
|
|
|
|
(declare (obsolete nil "28.1"))
|
|
|
|
|
0)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-insert-state-post-command-sentinel,
viper-change-state-to-vi, viper-change-state-to-emacs):
made aware of cursor coloring in the emacs state.
(viper-special-read-and-insert-char): use read-char-exclusive.
(viper-minibuffer-trim-tail): workaround for fields in minibuffer.
* viper-init.el (viper-emacs-state-cursor-color): new variable.
* viper-util.el (viper-save-cursor-color,
viper-get-saved-cursor-color-in-replace-mode,
viper-get-saved-cursor-color-in-insert-mode,
viper-restore-cursor-color): make aware of the cursor color in emacs
state.
(viper-get-saved-cursor-color-in-emacs-mode): new function.
* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option,
ediff-ignore-case-option3, ediff-actual-diff-options,
ediff-actual-diff3-options): new variables to control case sensitivity.
(ediff-make-diff2-buffer, ediff-setup-fine-diff-regions,
ediff-setup-diff-regions3): made aware of case-sensitivity.
(ediff-toggle-ignore-case): new function.
(ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers.
* ediff-help.el (ediff-long-help-message-narrow2,
ediff-long-help-message-compare2, ediff-long-help-message-compare3,
ediff-long-help-message-word-mode): add ignore-case command.
(ediff-help-for-quick-help): add ignore-case command.
* ediff-merg.el: move provide to the end.
* ediff-ptch.el: move provide to the end.
* ediff-wind.el: move provide to the end.
* ediff-mult.el: move provide to the end.
(ediff-set-meta-overlay): enable follow-link.
* ediff.el: move provide to the end.
Break recursive load cycle in eval-when-compile.
(ediff-patch-buffer): better heuristics.
* ediff-util.el: move provide to the end.
Break recursive load cycle in eval-when-compile.
(ediff-setup-keymap): add binding for #c. Replaced some defsubsts with
defuns.
(ediff-submit-report): pass the values of ediff-diff3-program,
ediff-diff3-options.
2006-02-19 03:16:45 +00:00
|
|
|
(provide 'ediff-wind)
|
1995-03-16 22:34:51 +00:00
|
|
|
;;; ediff-wind.el ends here
|