2019-06-21 01:16:54 -04:00
|
|
|
;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff -*- lexical-binding:t -*-
|
1996-01-14 07:34:30 +00:00
|
|
|
|
2021-01-01 01:13:56 -08:00
|
|
|
;; Copyright (C) 1994-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:
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2014-12-05 12:49:53 -05:00
|
|
|
(require 'cl-lib)
|
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
;; Start compiler pacifier
|
|
|
|
(defvar ediff-metajob-name)
|
|
|
|
(defvar ediff-meta-buffer)
|
|
|
|
(defvar ediff-grab-mouse)
|
|
|
|
(defvar ediff-mouse-pixel-position)
|
|
|
|
(defvar ediff-mouse-pixel-threshold)
|
|
|
|
(defvar ediff-whitespace)
|
|
|
|
(defvar ediff-multiframe)
|
1998-05-04 22:42:59 +00:00
|
|
|
(defvar ediff-use-toolbar-p)
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
(defvar mswindowsx-bitmap-file-path)
|
1996-06-22 01:54:34 +00:00
|
|
|
;; end pacifier
|
|
|
|
|
|
|
|
(defvar ediff-force-faces nil
|
|
|
|
"If t, Ediff will think that it is running on a display that supports faces.
|
|
|
|
This is provided as a temporary relief for users of face-capable displays
|
|
|
|
that Ediff doesn't know about.")
|
|
|
|
|
1995-06-05 23:43:51 +00:00
|
|
|
;; Are we running as a window application or on a TTY?
|
|
|
|
(defsubst ediff-device-type ()
|
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
|
|
|
(declare (obsolete nil "27.1"))
|
|
|
|
window-system)
|
1996-06-22 01:54:34 +00:00
|
|
|
|
1995-06-05 23:43:51 +00:00
|
|
|
;; in XEmacs: device-type is tty on tty and stream in batch.
|
1996-02-16 06:36:35 +00:00
|
|
|
(defun ediff-window-display-p ()
|
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
|
|
|
(and window-system
|
|
|
|
(not (memq window-system '(tty pc stream)))))
|
1996-02-16 06:36:35 +00:00
|
|
|
|
|
|
|
;; test if supports faces
|
|
|
|
(defun ediff-has-face-support-p ()
|
|
|
|
(cond ((ediff-window-display-p))
|
|
|
|
(ediff-force-faces)
|
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-color-p))
|
|
|
|
(t (memq window-system '(pc)))))
|
1996-12-28 02:53:04 +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
|
|
|
;; toolbar support for emacs hasn't been implemented in ediff
|
1998-05-04 22:42:59 +00:00
|
|
|
(defun ediff-has-toolbar-support-p ()
|
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
|
|
|
nil)
|
1998-05-04 22:42:59 +00:00
|
|
|
|
2002-02-10 06:46:12 +00:00
|
|
|
|
|
|
|
(defun ediff-has-gutter-support-p ()
|
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
|
|
|
(declare (obsolete nil "27.1"))
|
|
|
|
nil)
|
2002-02-10 06:46:12 +00:00
|
|
|
|
1998-05-04 22:42:59 +00:00
|
|
|
(defun ediff-use-toolbar-p ()
|
|
|
|
(and (ediff-has-toolbar-support-p) ;Can it do it ?
|
|
|
|
(boundp 'ediff-use-toolbar-p)
|
|
|
|
ediff-use-toolbar-p)) ;Does the user want it ?
|
|
|
|
|
2007-06-12 21:18:46 +00:00
|
|
|
;; Defines VAR as an advertised local variable.
|
1996-06-22 01:54:34 +00:00
|
|
|
;; Performs a defvar, then executes `make-variable-buffer-local' on
|
|
|
|
;; the variable. Also sets the `permanent-local' property,
|
|
|
|
;; so that `kill-all-local-variables' (called by major-mode setting
|
|
|
|
;; commands) won't destroy Ediff control variables.
|
2000-10-31 18:05:59 +00:00
|
|
|
;;
|
2021-01-31 16:27:26 +01:00
|
|
|
;; Plagiarized from `emerge-defvar-local'.
|
2000-10-31 18:05:59 +00:00
|
|
|
(defmacro ediff-defvar-local (var value doc)
|
2007-06-12 21:18:46 +00:00
|
|
|
"Defines VAR as a local variable."
|
2019-06-21 01:16:54 -04:00
|
|
|
(declare (indent defun) (doc-string 3))
|
1999-11-25 04:34:23 +00:00
|
|
|
`(progn
|
2021-01-31 16:27:26 +01:00
|
|
|
(defvar-local ,var ,value ,doc)
|
1999-11-25 04:34:23 +00:00
|
|
|
(put ',var 'permanent-local t)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
|
|
|
|
|
|
|
|
;; Variables that control each Ediff session---local to the control buffer.
|
|
|
|
|
|
|
|
;; Mode variables
|
|
|
|
;; The buffer in which the A variant is stored.
|
|
|
|
(ediff-defvar-local ediff-buffer-A nil "")
|
|
|
|
;; The buffer in which the B variant is stored.
|
|
|
|
(ediff-defvar-local ediff-buffer-B nil "")
|
1999-11-01 07:16:15 +00:00
|
|
|
;; The buffer in which the C variant is stored or where the merge buffer lives.
|
1996-06-22 01:54:34 +00:00
|
|
|
(ediff-defvar-local ediff-buffer-C nil "")
|
|
|
|
;; Ancestor buffer
|
|
|
|
(ediff-defvar-local ediff-ancestor-buffer nil "")
|
1997-05-31 01:10:39 +00:00
|
|
|
;; The Ediff control buffer
|
1996-06-22 01:54:34 +00:00
|
|
|
(ediff-defvar-local ediff-control-buffer nil "")
|
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
|
|
|
(ediff-defvar-local ediff-temp-indirect-buffer nil
|
|
|
|
"If t, the buffer is a temporary indirect buffer.
|
|
|
|
It needs to be killed when we quit the session.")
|
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
|
|
|
|
;; Association between buff-type and ediff-buffer-*
|
|
|
|
(defconst ediff-buffer-alist
|
|
|
|
'((?A . ediff-buffer-A)
|
|
|
|
(?B . ediff-buffer-B)
|
|
|
|
(?C . ediff-buffer-C)))
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;;; Macros
|
2014-12-05 12:49:53 -05:00
|
|
|
(defsubst ediff-buffer-live-p (buf)
|
|
|
|
(and buf (get-buffer buf) (buffer-name (get-buffer buf))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
(defmacro ediff-get-buffer (arg)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(cond ((eq ,arg 'A) ediff-buffer-A)
|
|
|
|
((eq ,arg 'B) ediff-buffer-B)
|
|
|
|
((eq ,arg 'C) ediff-buffer-C)
|
|
|
|
((eq ,arg 'Ancestor) ediff-ancestor-buffer)
|
|
|
|
))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-get-value-according-to-buffer-type (buf-type list)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(cond ((eq ,buf-type 'A) (nth 0 ,list))
|
|
|
|
((eq ,buf-type 'B) (nth 1 ,list))
|
|
|
|
((eq ,buf-type 'C) (nth 2 ,list))
|
|
|
|
))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-char-to-buftype (arg)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(cond ((memq ,arg '(?a ?A)) 'A)
|
|
|
|
((memq ,arg '(?b ?B)) 'B)
|
|
|
|
((memq ,arg '(?c ?C)) 'C)
|
|
|
|
))
|
1997-07-31 04:04:23 +00:00
|
|
|
|
1997-08-09 04:30:41 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
;; A-list is supposed to be of the form (A . symb) (B . symb)...)
|
|
|
|
;; where the first part of any association is a buffer type and the second is
|
1999-11-01 07:16:15 +00:00
|
|
|
;; an appropriate symbol. Given buffer-type, this function returns the
|
|
|
|
;; symbol. This is used to avoid using `intern'
|
1997-07-31 04:04:23 +00:00
|
|
|
(defsubst ediff-get-symbol-from-alist (buf-type alist)
|
|
|
|
(cdr (assoc buf-type alist)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2017-01-25 15:15:16 +09:00
|
|
|
;; Vector of differences between the variants. Each difference is
|
|
|
|
;; represented by a vector of two overlays plus a vector of fine diffs,
|
|
|
|
;; plus a no-fine-diffs flag. The first overlay spans the
|
|
|
|
;; difference region in the A buffer and the second overlays the diff in
|
|
|
|
;; the B buffer. If a difference section is empty, the corresponding
|
|
|
|
;; overlay's endpoints coincide.
|
|
|
|
;;
|
|
|
|
;; The precise form of a Difference Vector for one buffer is:
|
|
|
|
;; [diff diff diff ...]
|
|
|
|
;; where each diff has the form:
|
|
|
|
;; [diff-overlay fine-diff-vector no-fine-diffs-flag state-of-diff]
|
|
|
|
;; fine-diff-vector is a vector [fine-diff-overlay fine-diff-overlay ...]
|
|
|
|
;; no-fine-diffs-flag says if there are fine differences.
|
|
|
|
;; state-of-difference is A, B, C, or nil, indicating which buffer is
|
|
|
|
;; different from the other two (used only in 3-way jobs.
|
|
|
|
(ediff-defvar-local ediff-difference-vector-A nil "")
|
|
|
|
(ediff-defvar-local ediff-difference-vector-B nil "")
|
|
|
|
(ediff-defvar-local ediff-difference-vector-C nil "")
|
|
|
|
(ediff-defvar-local ediff-difference-vector-Ancestor nil "")
|
|
|
|
;; A-list of diff vector types associated with buffer types
|
1997-07-31 04:04:23 +00:00
|
|
|
(defconst ediff-difference-vector-alist
|
|
|
|
'((A . ediff-difference-vector-A)
|
|
|
|
(B . ediff-difference-vector-B)
|
|
|
|
(C . ediff-difference-vector-C)
|
|
|
|
(Ancestor . ediff-difference-vector-Ancestor)))
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-get-difference (n buf-type)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(aref
|
|
|
|
(symbol-value
|
|
|
|
(ediff-get-symbol-from-alist
|
|
|
|
,buf-type ediff-difference-vector-alist))
|
|
|
|
,n))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
;; Tell if it has been previously determined that the region has
|
1995-03-16 22:34:51 +00:00
|
|
|
;; no diffs other than the white space and newlines
|
|
|
|
;; The argument, N, is the diff region number used by Ediff to index the
|
1999-11-01 07:16:15 +00:00
|
|
|
;; diff vector. It is 1 less than the number seen by the user.
|
1997-05-31 01:10:39 +00:00
|
|
|
;; Returns:
|
|
|
|
;; t if the diffs are whitespace in all buffers
|
|
|
|
;; 'A (in 3-buf comparison only) if there are only whitespace
|
|
|
|
;; diffs in bufs B and C
|
|
|
|
;; 'B (in 3-buf comparison only) if there are only whitespace
|
|
|
|
;; diffs in bufs A and C
|
|
|
|
;; 'C (in 3-buf comparison only) if there are only whitespace
|
|
|
|
;; diffs in bufs A and B
|
1995-03-16 22:34:51 +00:00
|
|
|
;;
|
1999-11-01 07:16:15 +00:00
|
|
|
;; A Difference Vector has the form:
|
1995-03-16 22:34:51 +00:00
|
|
|
;; [diff diff diff ...]
|
|
|
|
;; where each diff has the form:
|
1999-11-01 07:16:15 +00:00
|
|
|
;; [overlay fine-diff-vector no-fine-diffs-flag state-of-difference]
|
1995-03-16 22:34:51 +00:00
|
|
|
;; fine-diff-vector is a vector [fine-diff fine-diff fine-diff ...]
|
1999-11-01 07:16:15 +00:00
|
|
|
;; no-fine-diffs-flag says if there are fine differences.
|
|
|
|
;; state-of-difference is A, B, C, or nil, indicating which buffer is
|
|
|
|
;; different from the other two (used only in 3-way jobs).
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-no-fine-diffs-p (n)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(aref (ediff-get-difference ,n 'A) 2))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-get-diff-overlay-from-diff-record (diff-rec)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(aref ,diff-rec 0))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
|
|
|
(defmacro ediff-get-diff-overlay (n buf-type)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(ediff-get-diff-overlay-from-diff-record
|
|
|
|
(ediff-get-difference ,n ,buf-type)))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
(defmacro ediff-get-fine-diff-vector-from-diff-record (diff-rec)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(aref ,diff-rec 1))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-set-fine-diff-vector (n buf-type fine-vec)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(aset (ediff-get-difference ,n ,buf-type) 1 ,fine-vec))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-get-state-of-diff (n buf-type)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(if (ediff-buffer-live-p ediff-buffer-C)
|
|
|
|
(aref (ediff-get-difference ,n ,buf-type) 3)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-set-state-of-diff (n buf-type val)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(aset (ediff-get-difference ,n ,buf-type) 3 ,val))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-get-state-of-merge (n)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(if ediff-state-of-merge
|
|
|
|
(aref (aref ediff-state-of-merge ,n) 0)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-set-state-of-merge (n val)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(if ediff-state-of-merge
|
|
|
|
(aset (aref ediff-state-of-merge ,n) 0 ,val)))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
(defmacro ediff-get-state-of-ancestor (n)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(if ediff-state-of-merge
|
|
|
|
(aref (aref ediff-state-of-merge ,n) 1)))
|
1999-11-01 07:16:15 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
;; if flag is t, puts a mark on diff region saying that
|
1999-11-01 07:16:15 +00:00
|
|
|
;; the differences are in white space only. If flag is nil,
|
1995-03-16 22:34:51 +00:00
|
|
|
;; the region is marked as essential (i.e., differences are
|
|
|
|
;; not just in the white space and newlines.)
|
|
|
|
(defmacro ediff-mark-diff-as-space-only (n flag)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(aset (ediff-get-difference ,n 'A) 2 ,flag))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-get-fine-diff-vector (n buf-type)
|
1999-11-25 04:34:23 +00:00
|
|
|
`(ediff-get-fine-diff-vector-from-diff-record
|
|
|
|
(ediff-get-difference ,n ,buf-type)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
;; Macro to switch to BUFFER, evaluate BODY, returns to original buffer.
|
|
|
|
;; Doesn't save the point and mark.
|
|
|
|
;; This is `with-current-buffer' with the added test for live buffers."
|
|
|
|
(defmacro ediff-with-current-buffer (buffer &rest body)
|
2007-06-12 21:18:46 +00:00
|
|
|
"Evaluates BODY in BUFFER."
|
2007-05-25 16:41:25 +00:00
|
|
|
(declare (indent 1) (debug (form body)))
|
1999-11-25 04:34:23 +00:00
|
|
|
`(if (ediff-buffer-live-p ,buffer)
|
1997-07-31 04:04:23 +00:00
|
|
|
(save-current-buffer
|
1999-11-25 04:34:23 +00:00
|
|
|
(set-buffer ,buffer)
|
|
|
|
,@body)
|
1997-07-31 04:04:23 +00:00
|
|
|
(or (eq this-command 'ediff-quit)
|
|
|
|
(error ediff-KILLED-VITAL-BUFFER))
|
1999-11-25 04:34:23 +00:00
|
|
|
))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
(defsubst ediff-multiframe-setup-p ()
|
|
|
|
(and (ediff-window-display-p) ediff-multiframe))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-narrow-control-frame-p ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(and (ediff-multiframe-setup-p)
|
|
|
|
(equal ediff-help-message ediff-brief-message-string)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-3way-comparison-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(memq
|
1999-11-25 04:34:23 +00:00
|
|
|
ediff-job-name
|
|
|
|
'(ediff-files3 ediff-buffers3)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-3way-comparison-job nil "")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-merge-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(memq
|
1999-11-25 04:34:23 +00:00
|
|
|
ediff-job-name
|
|
|
|
'(ediff-merge-files
|
|
|
|
ediff-merge-buffers
|
|
|
|
ediff-merge-files-with-ancestor
|
|
|
|
ediff-merge-buffers-with-ancestor
|
|
|
|
ediff-merge-revisions
|
|
|
|
ediff-merge-revisions-with-ancestor)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-merge-job nil "")
|
|
|
|
|
2002-03-20 06:36:18 +00:00
|
|
|
(defmacro ediff-patch-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(eq ediff-job-name 'epatch))
|
2002-03-20 06:36:18 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-merge-with-ancestor-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(memq
|
1999-11-25 04:34:23 +00:00
|
|
|
ediff-job-name
|
|
|
|
'(ediff-merge-files-with-ancestor
|
|
|
|
ediff-merge-buffers-with-ancestor
|
|
|
|
ediff-merge-revisions-with-ancestor)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-merge-with-ancestor-job nil "")
|
|
|
|
|
|
|
|
(defmacro ediff-3way-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(or ediff-3way-comparison-job ediff-merge-job))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-3way-job nil "")
|
|
|
|
|
|
|
|
;; A diff3 job is like a 3way job, but ediff-merge doesn't require the use
|
|
|
|
;; of diff3.
|
|
|
|
(defmacro ediff-diff3-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(or ediff-3way-comparison-job
|
1999-11-25 04:34:23 +00:00
|
|
|
ediff-merge-with-ancestor-job))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-diff3-job nil "")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-06-05 23:43:51 +00:00
|
|
|
(defmacro ediff-windows-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(memq ediff-job-name '(ediff-windows-wordwise ediff-windows-linewise)))
|
1995-06-05 23:43:51 +00:00
|
|
|
(ediff-defvar-local ediff-windows-job nil "")
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defmacro ediff-word-mode-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(memq ediff-job-name '(ediff-windows-wordwise ediff-regions-wordwise)))
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-word-mode-job nil "")
|
|
|
|
|
1995-06-05 23:43:51 +00:00
|
|
|
(defmacro ediff-narrow-job ()
|
2018-11-05 01:22:15 +01:00
|
|
|
'(memq ediff-job-name '(ediff-windows-wordwise
|
1999-11-25 04:34:23 +00:00
|
|
|
ediff-regions-wordwise
|
|
|
|
ediff-windows-linewise
|
|
|
|
ediff-regions-linewise)))
|
1995-06-05 23:43:51 +00:00
|
|
|
(ediff-defvar-local ediff-narrow-job nil "")
|
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
;; Note: ediff-merge-directory-revisions-with-ancestor is not treated as an
|
|
|
|
;; ancestor metajob, since it behaves differently.
|
|
|
|
(defsubst ediff-ancestor-metajob (&optional metajob)
|
|
|
|
(memq (or metajob ediff-metajob-name)
|
|
|
|
'(ediff-merge-directories-with-ancestor
|
|
|
|
ediff-merge-filegroups-with-ancestor)))
|
|
|
|
(defsubst ediff-revision-metajob (&optional metajob)
|
|
|
|
(memq (or metajob ediff-metajob-name)
|
2000-10-31 18:05:59 +00:00
|
|
|
'(ediff-directory-revisions
|
1995-10-06 00:55:57 +00:00
|
|
|
ediff-merge-directory-revisions
|
|
|
|
ediff-merge-directory-revisions-with-ancestor)))
|
1996-06-22 01:54:34 +00:00
|
|
|
(defsubst ediff-patch-metajob (&optional metajob)
|
|
|
|
(memq (or metajob ediff-metajob-name)
|
|
|
|
'(ediff-multifile-patch)))
|
2016-12-22 10:13:46 -08:00
|
|
|
;; metajob involving only one group of files, such as multi-patch or directory
|
1996-06-22 01:54:34 +00:00
|
|
|
;; revision
|
|
|
|
(defsubst ediff-one-filegroup-metajob (&optional metajob)
|
1995-10-06 00:55:57 +00:00
|
|
|
(or (ediff-revision-metajob metajob)
|
1996-06-22 01:54:34 +00:00
|
|
|
(ediff-patch-metajob metajob)
|
1995-10-06 00:55:57 +00:00
|
|
|
;; add more here
|
|
|
|
))
|
2002-03-05 05:34:19 +00:00
|
|
|
;; jobs suitable for the operation of collecting diffs into a multifile patch
|
1995-10-06 00:55:57 +00:00
|
|
|
(defsubst ediff-collect-diffs-metajob (&optional metajob)
|
1996-02-16 06:36:35 +00:00
|
|
|
(memq (or metajob ediff-metajob-name)
|
|
|
|
'(ediff-directories
|
|
|
|
ediff-merge-directories
|
|
|
|
ediff-merge-directories-with-ancestor
|
2002-03-05 05:34:19 +00:00
|
|
|
ediff-directory-revisions
|
1996-02-16 06:36:35 +00:00
|
|
|
ediff-merge-directory-revisions
|
|
|
|
ediff-merge-directory-revisions-with-ancestor
|
|
|
|
;; add more here
|
|
|
|
)))
|
1996-09-20 01:10:05 +00:00
|
|
|
(defsubst ediff-merge-metajob (&optional metajob)
|
|
|
|
(memq (or metajob ediff-metajob-name)
|
|
|
|
'(ediff-merge-directories
|
|
|
|
ediff-merge-directories-with-ancestor
|
|
|
|
ediff-merge-directory-revisions
|
|
|
|
ediff-merge-directory-revisions-with-ancestor
|
2000-10-31 18:05:59 +00:00
|
|
|
ediff-merge-filegroups-with-ancestor
|
1996-09-20 01:10:05 +00:00
|
|
|
;; add more here
|
|
|
|
)))
|
1996-02-16 06:36:35 +00:00
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
(defsubst ediff-metajob3 (&optional metajob)
|
|
|
|
(memq (or metajob ediff-metajob-name)
|
|
|
|
'(ediff-merge-directories-with-ancestor
|
2000-10-31 18:05:59 +00:00
|
|
|
ediff-merge-filegroups-with-ancestor
|
1995-10-06 00:55:57 +00:00
|
|
|
ediff-directories3
|
|
|
|
ediff-filegroups3)))
|
|
|
|
(defsubst ediff-comparison-metajob3 (&optional metajob)
|
|
|
|
(memq (or metajob ediff-metajob-name)
|
|
|
|
'(ediff-directories3 ediff-filegroups3)))
|
|
|
|
|
1996-12-28 02:53:04 +00:00
|
|
|
;; with no argument, checks if we are in ediff-control-buffer
|
|
|
|
;; with argument, checks if we are in ediff-meta-buffer
|
|
|
|
(defun ediff-in-control-buffer-p (&optional meta-buf-p)
|
|
|
|
(and (boundp 'ediff-control-buffer)
|
|
|
|
(eq (if meta-buf-p ediff-meta-buffer ediff-control-buffer)
|
|
|
|
(current-buffer))))
|
|
|
|
|
|
|
|
(defsubst ediff-barf-if-not-control-buffer (&optional meta-buf-p)
|
|
|
|
(or (ediff-in-control-buffer-p meta-buf-p)
|
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 "%S: This command runs in Ediff Control Buffer only!"
|
|
|
|
this-command)))
|
1995-10-06 00:55:57 +00:00
|
|
|
|
1997-11-01 01:46:51 +00:00
|
|
|
(defgroup ediff-highlighting nil
|
2011-12-04 00:02:42 -08:00
|
|
|
"Highlighting of difference regions in Ediff."
|
1997-11-01 01:46:51 +00:00
|
|
|
:prefix "ediff-"
|
|
|
|
:group 'ediff)
|
|
|
|
|
|
|
|
(defgroup ediff-merge nil
|
2005-07-04 02:00:10 +00:00
|
|
|
"Merging utilities."
|
1997-11-01 01:46:51 +00:00
|
|
|
:prefix "ediff-"
|
|
|
|
:group 'ediff)
|
|
|
|
|
|
|
|
(defgroup ediff-hook nil
|
2005-07-04 02:00:10 +00:00
|
|
|
"Hooks run by Ediff."
|
1997-11-01 01:46:51 +00:00
|
|
|
:prefix "ediff-"
|
|
|
|
:group 'ediff)
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Hook variables
|
|
|
|
|
2000-10-29 04:56:45 +00:00
|
|
|
(defcustom ediff-before-setup-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks to run before Ediff begins to set up windows and buffers.
|
2000-10-29 04:56:45 +00:00
|
|
|
This hook can be used to save the previous window config, which can be restored
|
|
|
|
on ediff-quit or ediff-suspend."
|
|
|
|
:type 'hook
|
2000-10-31 18:05:59 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-before-setup-windows-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks to run before Ediff sets its window configuration.
|
2000-10-31 18:05:59 +00:00
|
|
|
This hook is run every time when Ediff arranges its windows.
|
2000-10-29 04:56:45 +00:00
|
|
|
This happens each time Ediff detects that the windows were messed up by the
|
|
|
|
user."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
2000-10-31 18:05:59 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-after-setup-windows-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks to run after Ediff sets its window configuration.
|
1997-07-17 19:37:07 +00:00
|
|
|
This can be used to set up control window or icon in a desired place."
|
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-before-setup-control-frame-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks run before setting up the frame to display Ediff Control Panel.
|
1995-03-16 22:34:51 +00:00
|
|
|
Can be used to change control frame parameters to position it where it
|
1997-07-17 19:37:07 +00:00
|
|
|
is desirable."
|
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-after-setup-control-frame-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks run after setting up the frame to display Ediff Control Panel.
|
1997-07-17 19:37:07 +00:00
|
|
|
Can be used to move the frame where it is desired."
|
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-startup-hook nil
|
2020-12-19 17:26:58 +01:00
|
|
|
"Hooks to run in the control buffer after Ediff has been set up and is ready."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-select-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks to run after a difference has been selected."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-unselect-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks to run after a difference has been unselected."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-prepare-buffer-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks run after buffers A, B, and C are set up.
|
2000-10-31 18:05:59 +00:00
|
|
|
For each buffer, the hooks are run with that buffer made current."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-load-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hook run after Ediff is loaded. Can be used to change defaults."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
2020-01-16 23:06:04 -08:00
|
|
|
(make-obsolete-variable 'ediff-load-hook
|
|
|
|
"use `with-eval-after-load' instead." "28.1")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-mode-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hook run just after ediff-mode is set up in the control buffer.
|
1999-11-01 07:16:15 +00:00
|
|
|
This is done before any windows or frames are created. One can use it to
|
1997-07-17 19:37:07 +00:00
|
|
|
set local variables that determine how the display looks like."
|
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-keymap-setup-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hook run just after the default bindings in Ediff keymap are set up."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-display-help-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks run after preparing the help message."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
|
2000-12-25 07:57:37 +00:00
|
|
|
(defcustom ediff-suspend-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks to run in the Ediff control buffer when Ediff is suspended."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
2000-12-25 07:57:37 +00:00
|
|
|
(defcustom ediff-quit-hook nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Hooks to run in the Ediff control buffer after finishing Ediff."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
2000-10-31 18:05:59 +00:00
|
|
|
:group 'ediff-hook)
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-cleanup-hook nil
|
2020-12-19 17:26:58 +01:00
|
|
|
"Hooks to run on exiting Ediff, before killing the control and variant buffers."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'hook
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-hook)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
;; Error messages
|
|
|
|
(defconst ediff-KILLED-VITAL-BUFFER
|
|
|
|
"You have killed a vital Ediff buffer---you must leave Ediff now!")
|
|
|
|
(defconst ediff-NO-DIFFERENCES
|
1996-06-22 01:54:34 +00:00
|
|
|
"Sorry, comparison of identical variants is not what I am made for...")
|
|
|
|
(defconst ediff-BAD-DIFF-NUMBER
|
|
|
|
;; %S stands for this-command, %d - diff number, %d - max diff
|
1999-11-01 07:16:15 +00:00
|
|
|
"%S: Bad diff region number, %d. Valid numbers are 1 to %d")
|
1996-09-20 01:10:05 +00:00
|
|
|
(defconst ediff-BAD-INFO (format "
|
|
|
|
*** The Info file for Ediff, a part of the standard distribution
|
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
|
|
|
*** of Emacs, does not seem to be properly installed.
|
2000-10-31 18:05:59 +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
|
|
|
*** Please contact your system administrator. "))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Selective browsing
|
|
|
|
|
2019-06-21 01:16:54 -04:00
|
|
|
(ediff-defvar-local ediff-skip-diff-region-function #'ediff-show-all-diffs
|
1995-03-16 22:34:51 +00:00
|
|
|
"Function that determines the next/previous diff region to show.
|
|
|
|
Should return t for regions to be ignored and nil otherwise.
|
1999-11-01 07:16:15 +00:00
|
|
|
This function gets a region number as an argument. The region number
|
|
|
|
is the one used internally by Ediff. It is 1 less than the number seen
|
1995-03-16 22:34:51 +00:00
|
|
|
by the user.")
|
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
(ediff-defvar-local ediff-hide-regexp-matches-function
|
2000-10-31 18:05:59 +00:00
|
|
|
'ediff-hide-regexp-matches
|
1995-10-06 00:55:57 +00:00
|
|
|
"Function to use in determining which regions to hide.
|
|
|
|
See the documentation string of `ediff-hide-regexp-matches' for details.")
|
|
|
|
(ediff-defvar-local ediff-focus-on-regexp-matches-function
|
|
|
|
'ediff-focus-on-regexp-matches
|
|
|
|
"Function to use in determining which regions to focus on.
|
|
|
|
See the documentation string of `ediff-focus-on-regexp-matches' for details.")
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Regexp that determines buf A regions to focus on when skipping to diff
|
|
|
|
(ediff-defvar-local ediff-regexp-focus-A "" "")
|
|
|
|
;; Regexp that determines buf B regions to focus on when skipping to diff
|
|
|
|
(ediff-defvar-local ediff-regexp-focus-B "" "")
|
|
|
|
;; Regexp that determines buf C regions to focus on when skipping to diff
|
|
|
|
(ediff-defvar-local ediff-regexp-focus-C "" "")
|
|
|
|
;; connective that determines whether to focus regions that match both or
|
|
|
|
;; one of the regexps
|
|
|
|
(ediff-defvar-local ediff-focus-regexp-connective 'and "")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Regexp that determines buf A regions to ignore when skipping to diff
|
|
|
|
(ediff-defvar-local ediff-regexp-hide-A "" "")
|
|
|
|
;; Regexp that determines buf B regions to ignore when skipping to diff
|
|
|
|
(ediff-defvar-local ediff-regexp-hide-B "" "")
|
|
|
|
;; Regexp that determines buf C regions to ignore when skipping to diff
|
|
|
|
(ediff-defvar-local ediff-regexp-hide-C "" "")
|
|
|
|
;; connective that determines whether to hide regions that match both or
|
|
|
|
;; one of the regexps
|
|
|
|
(ediff-defvar-local ediff-hide-regexp-connective 'and "")
|
1997-07-17 19:37:07 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
|
|
|
;;; Copying difference regions between buffers.
|
|
|
|
|
|
|
|
;; A list of killed diffs.
|
1997-07-17 19:37:07 +00:00
|
|
|
;; A diff is saved here if it is replaced by a diff
|
|
|
|
;; from another buffer. This alist has the form:
|
|
|
|
;; \((num (buff-object . diff) (buff-object . diff) (buff-object . diff)) ...),
|
|
|
|
;; where some buffer-objects may be missing.
|
|
|
|
(ediff-defvar-local ediff-killed-diffs-alist nil "")
|
1995-03-16 22:34:51 +00:00
|
|
|
|
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
|
|
|
;; Syntax table to use in ediff-forward-word-function
|
|
|
|
;; This is chosen by a heuristic. The important thing is for all buffers to
|
|
|
|
;; have the same syntax table. Which is not too important.
|
|
|
|
(ediff-defvar-local ediff-syntax-table nil "")
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
;; Highlighting
|
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-before-flag-bol "->>"
|
2020-12-19 13:18:11 +02:00
|
|
|
"Flag placed before highlighted block of differences at beginning of a line."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'string
|
|
|
|
:tag "Region before-flag at beginning of line"
|
|
|
|
:group 'ediff)
|
|
|
|
|
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-after-flag-eol "<<-"
|
2020-12-19 13:18:11 +02:00
|
|
|
"Flag placed after highlighted block of differences that ends at end of line."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'string
|
|
|
|
:tag "Region after-flag at end of line"
|
|
|
|
:group 'ediff)
|
|
|
|
|
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-before-flag-mol "->>"
|
2020-12-19 13:18:11 +02:00
|
|
|
"Flag placed before highlighted block of differences that starts mid-line."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'string
|
|
|
|
:tag "Region before-flag in the middle of line"
|
|
|
|
:group 'ediff)
|
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-after-flag-mol "<<-"
|
2008-12-03 05:48:14 +00:00
|
|
|
"Flag placed after a highlighted block of differences, if block ends in mid-line."
|
1997-07-17 19:37:07 +00:00
|
|
|
:type 'string
|
|
|
|
:tag "Region after-flag in the middle of line"
|
|
|
|
:group 'ediff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
|
|
|
(defcustom ediff-use-faces t
|
1996-02-16 06:36:35 +00:00
|
|
|
"If t, differences are highlighted using faces, if device supports faces.
|
|
|
|
If nil, differences are highlighted using ASCII flags, ediff-before-flag
|
1995-03-16 22:34:51 +00:00
|
|
|
and ediff-after-flag. On a non-window system, differences are always
|
1998-05-04 22:42:59 +00:00
|
|
|
highlighted using ASCII flags."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'ediff-highlighting)
|
2014-02-15 19:09:27 -08:00
|
|
|
(make-variable-buffer-local 'ediff-use-faces)
|
|
|
|
(put 'ediff-use-faces 'permanent-local t)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
;; this indicates that diff regions are word-size, so fine diffs are
|
1995-06-05 23:43:51 +00:00
|
|
|
;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-word-mode nil "")
|
1995-10-06 00:55:57 +00:00
|
|
|
;; Name of the job (ediff-files, ediff-windows, etc.)
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-job-name nil "")
|
|
|
|
|
|
|
|
;; Narrowing and ediff-region/windows support
|
|
|
|
;; This is a list (overlay-A overlay-B overlay-C)
|
|
|
|
;; If set, Ediff compares only those parts of buffers A/B/C that lie within
|
|
|
|
;; the bounds of these overlays.
|
|
|
|
(ediff-defvar-local ediff-narrow-bounds nil "")
|
|
|
|
|
|
|
|
;; List (overlay-A overlay-B overlay-C), where each overlay spans the
|
|
|
|
;; entire corresponding buffer.
|
|
|
|
(ediff-defvar-local ediff-wide-bounds nil "")
|
|
|
|
|
|
|
|
;; Current visibility boundaries in buffers A, B, and C.
|
1999-11-01 07:16:15 +00:00
|
|
|
;; This is also a list of overlays. When the user toggles narrow/widen,
|
1995-03-16 22:34:51 +00:00
|
|
|
;; this list changes from ediff-wide-bounds to ediff-narrow-bounds.
|
|
|
|
;; and back.
|
|
|
|
(ediff-defvar-local ediff-visible-bounds nil "")
|
|
|
|
|
|
|
|
(ediff-defvar-local ediff-start-narrowed t
|
1995-06-05 23:43:51 +00:00
|
|
|
"Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*")
|
1995-03-16 22:34:51 +00:00
|
|
|
(ediff-defvar-local ediff-quit-widened t
|
2012-04-09 21:05:48 +08:00
|
|
|
"Non-nil means: when finished, Ediff widens buffers A/B.
|
1995-03-16 22:34:51 +00:00
|
|
|
Actually, Ediff restores the scope of visibility that existed at startup.")
|
1997-07-17 19:37:07 +00:00
|
|
|
|
|
|
|
(defcustom ediff-keep-variants t
|
2008-12-03 05:48:14 +00:00
|
|
|
"nil means prompt to remove unmodified buffers A/B/C at session end.
|
1996-01-04 23:33:39 +00:00
|
|
|
Supplying a prefix argument to the quit command `q' temporarily reverses the
|
1997-07-17 19:37:07 +00:00
|
|
|
meaning of this variable."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'ediff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1998-05-04 22:42:59 +00:00
|
|
|
(defcustom ediff-highlight-all-diffs t
|
1995-03-16 22:34:51 +00:00
|
|
|
"If nil, only the selected differences are highlighted.
|
1998-05-04 22:42:59 +00:00
|
|
|
Otherwise, all difference regions are highlighted, but the selected region is
|
|
|
|
shown in brighter colors."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'ediff-highlighting)
|
2014-02-15 19:09:27 -08:00
|
|
|
(make-variable-buffer-local 'ediff-highlight-all-diffs)
|
|
|
|
(put 'ediff-highlight-all-diffs 'permanent-local t)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; The suffix of the control buffer name.
|
|
|
|
(ediff-defvar-local ediff-control-buffer-suffix nil "")
|
2000-10-31 18:05:59 +00:00
|
|
|
;; Same as ediff-control-buffer-suffix, but without <,>.
|
1995-03-16 22:34:51 +00:00
|
|
|
;; It's a number rather than string.
|
|
|
|
(ediff-defvar-local ediff-control-buffer-number nil "")
|
|
|
|
|
|
|
|
|
|
|
|
;; The original values of ediff-protected-variables for buffer A
|
1995-06-05 23:43:51 +00:00
|
|
|
(ediff-defvar-local ediff-buffer-values-orig-A nil "")
|
1995-03-16 22:34:51 +00:00
|
|
|
;; The original values of ediff-protected-variables for buffer B
|
1995-06-05 23:43:51 +00:00
|
|
|
(ediff-defvar-local ediff-buffer-values-orig-B nil "")
|
1995-03-16 22:34:51 +00:00
|
|
|
;; The original values of ediff-protected-variables for buffer C
|
1995-06-05 23:43:51 +00:00
|
|
|
(ediff-defvar-local ediff-buffer-values-orig-C nil "")
|
1995-10-06 00:55:57 +00:00
|
|
|
;; The original values of ediff-protected-variables for buffer Ancestor
|
|
|
|
(ediff-defvar-local ediff-buffer-values-orig-Ancestor nil "")
|
1997-07-17 19:37:07 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
;; association between buff-type and ediff-buffer-values-orig-*
|
|
|
|
(defconst ediff-buffer-values-orig-alist
|
|
|
|
'((A . ediff-buffer-values-orig-A)
|
|
|
|
(B . ediff-buffer-values-orig-B)
|
|
|
|
(C . ediff-buffer-values-orig-C)
|
|
|
|
(Ancestor . ediff-buffer-values-orig-Ancestor)))
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Buffer-local variables to be saved then restored during Ediff sessions
|
1996-09-20 01:10:05 +00:00
|
|
|
(defconst ediff-protected-variables '(
|
2000-10-31 18:05:59 +00:00
|
|
|
;;buffer-read-only
|
1995-03-16 22:34:51 +00:00
|
|
|
mode-line-format))
|
1995-10-06 00:55:57 +00:00
|
|
|
|
|
|
|
;; [ status status status ...]
|
|
|
|
;; Each status: [state-of-merge state-of-ancestor]
|
1999-11-01 07:16:15 +00:00
|
|
|
;; state-of-merge is default-A, default-B, prefer-A, or prefer-B. It
|
1995-10-06 00:55:57 +00:00
|
|
|
;; indicates the way a diff region was created in buffer C.
|
|
|
|
;; state-of-ancestor says if the corresponding region in ancestor buffer is
|
|
|
|
;; empty.
|
|
|
|
(ediff-defvar-local ediff-state-of-merge nil "")
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
;; The difference that is currently selected.
|
|
|
|
(ediff-defvar-local ediff-current-difference -1 "")
|
|
|
|
;; Number of differences found.
|
|
|
|
(ediff-defvar-local ediff-number-of-differences nil "")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Buffer containing the output of diff, which is used by Ediff to step
|
|
|
|
;; through files.
|
|
|
|
(ediff-defvar-local ediff-diff-buffer nil "")
|
1999-11-01 07:16:15 +00:00
|
|
|
;; Like ediff-diff-buffer, but contains context diff. It is not used by
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Ediff, but it is saved in a file, if user requests so.
|
|
|
|
(ediff-defvar-local ediff-custom-diff-buffer nil "")
|
|
|
|
;; Buffer used for diff-style fine differences between regions.
|
|
|
|
(ediff-defvar-local ediff-fine-diff-buffer nil "")
|
|
|
|
;; Temporary buffer used for computing fine differences.
|
|
|
|
(defconst ediff-tmp-buffer " *ediff-tmp*" "")
|
|
|
|
;; Buffer used for messages
|
|
|
|
(defconst ediff-msg-buffer " *ediff-message*" "")
|
|
|
|
;; Buffer containing the output of diff when diff returns errors.
|
|
|
|
(ediff-defvar-local ediff-error-buffer nil "")
|
|
|
|
;; Buffer to display debug info
|
|
|
|
(ediff-defvar-local ediff-debug-buffer "*ediff-debug*" "")
|
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
;; List of ediff control panels associated with each buffer A/B/C/Ancestor.
|
|
|
|
;; Not used any more, but may be needed in the future.
|
|
|
|
(ediff-defvar-local ediff-this-buffer-ediff-sessions nil "")
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
;; to be deleted in due time
|
|
|
|
;; List of difference overlays disturbed by working with the current diff.
|
|
|
|
(defvar ediff-disturbed-overlays nil "")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-version-control-package 'vc
|
1995-10-06 00:55:57 +00:00
|
|
|
"Version control package used.
|
1999-11-01 07:16:15 +00:00
|
|
|
Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The
|
|
|
|
standard Emacs interface to RCS, CVS, SCCS, etc., is vc.el. However, some
|
|
|
|
people find the other two packages more convenient. Set this variable to the
|
1997-07-17 19:37:07 +00:00
|
|
|
appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire."
|
|
|
|
:type 'symbol
|
|
|
|
:group 'ediff)
|
1995-10-06 00:55:57 +00:00
|
|
|
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
(defcustom ediff-coding-system-for-read 'raw-text
|
2008-12-03 05:48:14 +00:00
|
|
|
"The coding system for read to use when running the diff program as a subprocess.
|
2008-10-19 08:24:49 +00:00
|
|
|
In most cases, the default will do. However, under certain circumstances in
|
2015-11-17 15:28:50 -08:00
|
|
|
MS-Windows you might need to use something like `raw-text-dos' here.
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
So, if the output that your diff program sends to Emacs contains extra ^M's,
|
2015-11-17 15:28:50 -08:00
|
|
|
you might need to experiment here, if the default or `raw-text-dos' doesn't
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
work."
|
|
|
|
:type 'symbol
|
|
|
|
:group 'ediff)
|
|
|
|
|
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-coding-system-for-write 'emacs-internal
|
2008-12-03 05:48:14 +00:00
|
|
|
"The coding system for write to use when writing out difference regions
|
2008-10-19 08:24:49 +00:00
|
|
|
to temp files in buffer jobs and when Ediff needs to find fine differences."
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
:type 'symbol
|
|
|
|
:group 'ediff)
|
|
|
|
|
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
|
|
|
(define-obsolete-function-alias 'ediff-read-event #'read-event "27.1")
|
2008-03-05 08:51:47 +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
|
|
|
(define-obsolete-function-alias 'ediff-overlayp #'overlayp "27.1")
|
2008-03-05 08:51:47 +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
|
|
|
(define-obsolete-function-alias 'ediff-make-overlay #'make-overlay "27.1")
|
2008-03-05 08:51:47 +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
|
|
|
(define-obsolete-function-alias 'ediff-delete-overlay #'delete-overlay "27.1")
|
2000-10-31 18:05:59 +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
|
|
|
(define-obsolete-function-alias 'ediff-color-display-p #'display-color-p "27.1")
|
1995-10-06 00:55:57 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2002-03-20 06:36:18 +00:00
|
|
|
;; A var local to each control panel buffer. Indicates highlighting style
|
|
|
|
;; in effect for this buffer: `face', `ascii',
|
2015-09-17 16:08:20 -07:00
|
|
|
;; `off' -- turned off (on a dumb terminal only).
|
2003-02-04 11:26:42 +00:00
|
|
|
(ediff-defvar-local ediff-highlighting-style
|
2002-03-20 06:36:18 +00:00
|
|
|
(if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii)
|
|
|
|
"")
|
|
|
|
|
|
|
|
|
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
|
|
|
(define-obsolete-function-alias 'ediff-display-pixel-width
|
|
|
|
#'display-pixel-width "27.1")
|
|
|
|
(define-obsolete-function-alias 'ediff-display-pixel-height
|
|
|
|
#'display-pixel-height "27.1")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2000-10-29 04:56:45 +00:00
|
|
|
;; A-list of current-diff-overlay symbols associated with buf types
|
1997-07-31 04:04:23 +00:00
|
|
|
(defconst ediff-current-diff-overlay-alist
|
|
|
|
'((A . ediff-current-diff-overlay-A)
|
|
|
|
(B . ediff-current-diff-overlay-B)
|
|
|
|
(C . ediff-current-diff-overlay-C)
|
|
|
|
(Ancestor . ediff-current-diff-overlay-Ancestor)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2000-10-29 04:56:45 +00:00
|
|
|
;; A-list of current-diff-face-* symbols associated with buf types
|
1997-07-31 04:04:23 +00:00
|
|
|
(defconst ediff-current-diff-face-alist
|
2005-07-10 18:46:24 +00:00
|
|
|
'((A . ediff-current-diff-A)
|
|
|
|
(B . ediff-current-diff-B)
|
|
|
|
(C . ediff-current-diff-C)
|
|
|
|
(Ancestor . ediff-current-diff-Ancestor)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
(defun ediff-set-overlay-face (extent face)
|
|
|
|
(ediff-overlay-put extent 'face face)
|
2014-05-02 22:27:46 -04:00
|
|
|
(ediff-overlay-put extent 'help-echo (if face 'ediff-region-help-echo)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2013-09-04 23:30:07 -04:00
|
|
|
(defun ediff-region-help-echo (extent-or-window &optional overlay _point)
|
2000-07-21 19:42:57 +00:00
|
|
|
(unless overlay
|
|
|
|
(setq overlay extent-or-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 ((is-current (overlay-get overlay 'ediff))
|
|
|
|
(face (overlay-get overlay 'face))
|
|
|
|
(diff-num (overlay-get overlay 'ediff-diff-num))
|
2000-07-24 09:44:02 +00:00
|
|
|
face-help)
|
1995-10-06 00:55:57 +00:00
|
|
|
|
|
|
|
;; This happens only for refinement overlays
|
2000-07-21 19:42:57 +00:00
|
|
|
(if (stringp face)
|
|
|
|
(setq face (intern face)))
|
1995-10-06 00:55:57 +00:00
|
|
|
(setq face-help (and face (get face 'ediff-help-echo)))
|
|
|
|
|
2000-07-19 15:56:50 +00:00
|
|
|
(cond ((and is-current diff-num) ; current diff region
|
1996-06-22 01:54:34 +00:00
|
|
|
(format "Difference region %S -- current" (1+ diff-num)))
|
2000-07-21 19:42:57 +00:00
|
|
|
(face-help) ; refinement of current diff region
|
2000-07-19 15:56:50 +00:00
|
|
|
(diff-num ; non-current
|
1996-06-22 01:54:34 +00:00
|
|
|
(format "Difference region %S -- non-current" (1+ diff-num)))
|
2000-07-19 15:56:50 +00:00
|
|
|
(t "")) ; none
|
2000-07-19 16:00:04 +00:00
|
|
|
))
|
1995-10-06 00:55:57 +00:00
|
|
|
|
1996-02-10 05:14:34 +00:00
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-set-face-pixmap (face pixmap)
|
|
|
|
"Set face pixmap on a monochrome display."
|
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 (and (ediff-window-display-p) (not (display-color-p)))
|
1996-09-20 01:10:05 +00:00
|
|
|
(condition-case nil
|
|
|
|
(set-face-background-pixmap face pixmap)
|
|
|
|
(error
|
|
|
|
(message "Pixmap not found for %S: %s" (face-name face) pixmap)
|
|
|
|
(sit-for 1)))))
|
|
|
|
|
1997-08-09 04:30:41 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-current-diff-A
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#ffdddd" :extend t)
|
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
|
|
|
(((class color) (min-colors 88) (background dark))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#553333" :extend t)
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "firebrick" :background "pale green" :extend t))
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "blue3" :background "yellow3" :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:inverse-video t :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the selected difference in buffer A."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-current-diff-face-A 'ediff-current-diff-A
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the selected difference in buffer A.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-current-diff-A'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-08-09 04:30:41 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-current-diff-B
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#ddffdd" :extend t)
|
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
|
|
|
(((class color) (min-colors 88) (background dark))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#335533" :extend t)
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "DarkOrchid" :background "Yellow" :extend t))
|
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
|
|
|
(((class color))
|
|
|
|
(:foreground "magenta3" :background "yellow3"
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:inverse-video t :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the selected difference in buffer B."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-current-diff-face-B 'ediff-current-diff-B
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the selected difference in buffer B.
|
1999-11-01 07:16:15 +00:00
|
|
|
this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face `ediff-current-diff-B'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-08-09 04:30:41 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-current-diff-C
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#ffffaa" :extend t)
|
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
|
|
|
(((class color) (min-colors 88) (background dark))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#888833" :extend t)
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "Navy" :background "Pink" :extend t))
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "cyan3" :background "yellow3" :weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:inverse-video t :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the selected difference in buffer C."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-current-diff-face-C 'ediff-current-diff-C
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the selected difference in buffer C.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-current-diff-C'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-08-09 04:30:41 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-current-diff-Ancestor
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#cfdeee" :extend t)
|
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
|
|
|
(((class color) (min-colors 88) (background dark))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#004151" :extend t)
|
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
|
|
|
(((class color) (min-colors 16) (background light))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#cfdeee" :extend t)
|
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
|
|
|
(((class color) (min-colors 16) (background dark))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:background "#004151" :extend t)
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "black" :background "magenta3" :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:inverse-video t :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the selected difference in buffer Ancestor."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-Ancestor
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the selected difference in buffer Ancestor.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-current-diff-Ancestor'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-08-09 04:30:41 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-fine-diff-A
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
|
|
|
:background "#ffbbbb")
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
:background "#aa2222")
|
|
|
|
(((class color) (min-colors 16))
|
|
|
|
(:foreground "Navy" :background "sky blue"))
|
|
|
|
(((class color))
|
|
|
|
(:foreground "white" :background "sky blue" :weight bold))
|
|
|
|
(t (:underline t :stipple "gray3")))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the refinement of the selected diff in buffer A."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-fine-diff-face-A 'ediff-fine-diff-A
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the fine differences in buffer A.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-fine-diff-A'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-fine-diff-B
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
|
|
|
:background "#aaffaa")
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
:background "#22aa22")
|
|
|
|
(((class color) (min-colors 16))
|
|
|
|
(:foreground "Black" :background "cyan"))
|
|
|
|
(((class color))
|
|
|
|
(:foreground "magenta3" :background "cyan3"))
|
|
|
|
(t (:underline t :stipple "gray3")))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the refinement of the selected diff in buffer B."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-fine-diff-face-B 'ediff-fine-diff-B
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the fine differences in buffer B.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-fine-diff-B'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-fine-diff-C
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
|
|
|
:background "#ffff55")
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
:background "#aaaa22")
|
|
|
|
(((type pc))
|
|
|
|
(:foreground "white" :background "Turquoise"))
|
|
|
|
(((class color) (min-colors 16))
|
|
|
|
(:foreground "Black" :background "Turquoise"))
|
|
|
|
(((class color))
|
|
|
|
(:foreground "yellow3" :background "Turquoise"
|
|
|
|
:weight bold))
|
|
|
|
(t (:underline t :stipple "gray3")))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the refinement of the selected diff in buffer C."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-fine-diff-face-C 'ediff-fine-diff-C
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the fine differences in buffer C.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-fine-diff-C'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-fine-diff-Ancestor
|
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
|
|
|
'((((class color) (min-colors 88) (background light))
|
|
|
|
:background "#00c5c0")
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
:background "#009591")
|
|
|
|
(((class color) (min-colors 16) (background light))
|
|
|
|
:background "#00c5c0")
|
|
|
|
(((class color) (min-colors 16) (background dark))
|
|
|
|
:background "#009591")
|
|
|
|
(((class color))
|
|
|
|
(:foreground "red3" :background "green"))
|
|
|
|
(t (:underline t :stipple "gray3")))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting the refinement of the selected diff in the ancestor buffer.
|
|
|
|
At present, this face is not used and no fine differences are computed for the
|
|
|
|
ancestor buffer."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-Ancestor
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting the fine differences in buffer Ancestor.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-fine-diff-Ancestor'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
;; Some installs don't have stipple or Stipple. So, try them in turn.
|
|
|
|
(defvar stipple-pixmap
|
1999-11-25 04:34:23 +00:00
|
|
|
(cond ((not (ediff-has-face-support-p)) nil)
|
1999-11-01 07:16:15 +00:00
|
|
|
((and (boundp 'x-bitmap-file-path)
|
|
|
|
(locate-library "stipple" t x-bitmap-file-path)) "stipple")
|
|
|
|
((and (boundp 'mswindowsx-bitmap-file-path)
|
|
|
|
(locate-library "stipple" t mswindowsx-bitmap-file-path)) "stipple")
|
|
|
|
(t "Stipple")))
|
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-even-diff-A
|
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
|
|
|
`((((type pc))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "green3" :background "light grey" :extend t))
|
2021-02-10 21:37:47 +02:00
|
|
|
(((class color) (min-colors 88) (background light))
|
|
|
|
(:distant-foreground "Black" :background "light grey" :extend t))
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
(:distant-foreground "White" :background "dark grey" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "Black" :background "light grey" :extend t))
|
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
|
|
|
(((class color))
|
|
|
|
(:foreground "red3" :background "light grey"
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple ,stipple-pixmap :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in buffer A."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-even-diff-face-A 'ediff-even-diff-A
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in buffer A.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-even-diff-A'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-even-diff-B
|
2021-02-10 21:37:47 +02:00
|
|
|
`((((class color) (min-colors 88) (background light))
|
|
|
|
(:distant-foreground "Black" :background "Grey" :extend t))
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
(:distant-foreground "White" :background "dim grey" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "White" :background "Grey" :extend t))
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "blue3" :background "Grey" :weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple ,stipple-pixmap :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in buffer B."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-even-diff-face-B 'ediff-even-diff-B
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in buffer B.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-even-diff-B'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-even-diff-C
|
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
|
|
|
`((((type pc))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "yellow3" :background "light grey" :extend t))
|
2021-02-10 21:37:47 +02:00
|
|
|
(((class color) (min-colors 88) (background light))
|
|
|
|
(:distant-foreground "Black" :background "light grey" :extend t))
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
(:distant-foreground "White" :background "dark grey" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "Black" :background "light grey" :extend t))
|
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
|
|
|
(((class color))
|
|
|
|
(:foreground "yellow3" :background "light grey"
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple ,stipple-pixmap :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in buffer C."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-even-diff-face-C 'ediff-even-diff-C
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in buffer C.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-even-diff-C'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-even-diff-Ancestor
|
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
|
|
|
`((((type pc))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "cyan3" :background "light grey" :extend t))
|
2021-02-10 21:37:47 +02:00
|
|
|
(((class color) (min-colors 88) (background light))
|
|
|
|
(:distant-foreground "Black" :background "Grey" :extend t))
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
(:distant-foreground "White" :background "dim grey" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "White" :background "Grey" :extend t))
|
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
|
|
|
(((class color))
|
|
|
|
(:foreground "cyan3" :background "light grey"
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
:weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple ,stipple-pixmap :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in the ancestor buffer."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-Ancestor
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting even-numbered non-current differences in buffer Ancestor.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-even-diff-Ancestor'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
;; Association between buffer types and even-diff-face symbols
|
|
|
|
(defconst ediff-even-diff-face-alist
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
'((A . ediff-even-diff-A)
|
|
|
|
(B . ediff-even-diff-B)
|
|
|
|
(C . ediff-even-diff-C)
|
|
|
|
(Ancestor . ediff-even-diff-Ancestor)))
|
1997-07-31 04:04:23 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-odd-diff-A
|
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
|
|
|
'((((type pc))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "green3" :background "gray40" :extend t))
|
2021-02-10 21:37:47 +02:00
|
|
|
(((class color) (min-colors 88) (background light))
|
|
|
|
(:distant-foreground "Black" :background "Grey" :extend t))
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
(:distant-foreground "White" :background "dim grey" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "White" :background "Grey" :extend t))
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "red3" :background "black" :weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple "gray1" :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in buffer A."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-odd-diff-face-A 'ediff-odd-diff-A
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in buffer A.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-odd-diff-A'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-08-09 04:30:41 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-odd-diff-B
|
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
|
|
|
'((((type pc))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "White" :background "gray40" :extend t))
|
2021-02-10 21:37:47 +02:00
|
|
|
(((class color) (min-colors 88) (background light))
|
|
|
|
(:distant-foreground "Black" :background "light grey" :extend t))
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
(:distant-foreground "White" :background "dark grey" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "Black" :background "light grey" :extend t))
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "cyan3" :background "black" :weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple "gray1" :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in buffer B."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-odd-diff-face-B 'ediff-odd-diff-B
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in buffer B.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-odd-diff-B'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-odd-diff-C
|
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
|
|
|
'((((type pc))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "yellow3" :background "gray40" :extend t))
|
2021-02-10 21:37:47 +02:00
|
|
|
(((class color) (min-colors 88) (background light))
|
|
|
|
(:distant-foreground "Black" :background "Grey" :extend t))
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
(:distant-foreground "White" :background "dim grey" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "White" :background "Grey" :extend t))
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "yellow3" :background "black" :weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple "gray1" :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in buffer C."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-odd-diff-face-C 'ediff-odd-diff-C
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in buffer C.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-odd-diff-C'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defface ediff-odd-diff-Ancestor
|
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
|
|
|
'((((class color) (min-colors 88))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:background "gray40" :extend t))
|
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
|
|
|
(((class color) (min-colors 16))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "cyan3" :background "gray40" :extend t))
|
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
|
|
|
(((class color))
|
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
2019-10-19 23:51:03 +03:00
|
|
|
(:foreground "green3" :background "black" :weight bold :extend t))
|
Add ':extend' attribute to faces and themes
* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
2019-11-30 13:27:11 +02:00
|
|
|
(t (:italic t :stipple "gray1" :extend t)))
|
1997-08-09 04:30:41 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in the ancestor buffer."
|
|
|
|
:group 'ediff-highlighting)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; An internal variable. Ediff takes the face from here. When unhighlighting,
|
1997-08-09 04:30:41 +00:00
|
|
|
;; this variable is set to nil, then again to the appropriate face.
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
(defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-Ancestor
|
1997-09-30 01:13:53 +00:00
|
|
|
"Face for highlighting odd-numbered non-current differences in buffer Ancestor.
|
1999-11-01 07:16:15 +00:00
|
|
|
DO NOT CHANGE this variable. Instead, use the customization
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
Remove "-face" suffix from ediff faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/ediff-init.el (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):
Remove "-face" suffix from face names.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
New backward-compatibility aliases for renamed faces.
(ediff-current-diff-face-A, ediff-current-diff-face-B)
(ediff-current-diff-face-C, ediff-current-diff-face-Ancestor)
(ediff-fine-diff-face-A, ediff-fine-diff-face-B)
(ediff-fine-diff-face-C, ediff-fine-diff-face-Ancestor)
(ediff-even-diff-face-A, ediff-even-diff-face-B)
(ediff-even-diff-face-C, ediff-even-diff-face-Ancestor)
(ediff-odd-diff-face-A, ediff-odd-diff-face-B)
(ediff-odd-diff-face-C, ediff-odd-diff-face-Ancestor):
Use renamed ediff faces.
2005-06-17 05:55:26 +00:00
|
|
|
widget to customize the actual face object `ediff-odd-diff-Ancestor'
|
1997-09-30 01:13:53 +00:00
|
|
|
this variable represents.")
|
1997-11-25 02:10:08 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
;; Association between buffer types and odd-diff-face symbols
|
|
|
|
(defconst ediff-odd-diff-face-alist
|
2005-07-10 18:46:24 +00:00
|
|
|
'((A . ediff-odd-diff-A)
|
|
|
|
(B . ediff-odd-diff-B)
|
|
|
|
(C . ediff-odd-diff-C)
|
|
|
|
(Ancestor . ediff-odd-diff-Ancestor)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-07-31 04:04:23 +00:00
|
|
|
;; A-list of fine-diff face symbols associated with buffer types
|
|
|
|
(defconst ediff-fine-diff-face-alist
|
2005-07-10 18:46:24 +00:00
|
|
|
'((A . ediff-fine-diff-A)
|
|
|
|
(B . ediff-fine-diff-B)
|
|
|
|
(C . ediff-fine-diff-C)
|
|
|
|
(Ancestor . ediff-fine-diff-Ancestor)))
|
1997-07-31 04:04:23 +00:00
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
;; Help echo
|
2005-07-10 18:46:24 +00:00
|
|
|
(put ediff-fine-diff-face-A 'ediff-help-echo
|
1995-10-06 00:55:57 +00:00
|
|
|
"A `refinement' of the current difference region")
|
2005-07-10 18:46:24 +00:00
|
|
|
(put ediff-fine-diff-face-B 'ediff-help-echo
|
1995-10-06 00:55:57 +00:00
|
|
|
"A `refinement' of the current difference region")
|
2005-07-10 18:46:24 +00:00
|
|
|
(put ediff-fine-diff-face-C 'ediff-help-echo
|
1995-10-06 00:55:57 +00:00
|
|
|
"A `refinement' of the current difference region")
|
2005-07-10 18:46:24 +00:00
|
|
|
(put ediff-fine-diff-face-Ancestor 'ediff-help-echo
|
1995-10-06 00:55:57 +00:00
|
|
|
"A `refinement' of the current difference region")
|
|
|
|
|
2000-12-25 07:57:37 +00:00
|
|
|
(add-hook 'ediff-quit-hook 'ediff-cleanup-mess)
|
|
|
|
(add-hook 'ediff-suspend-hook 'ediff-default-suspend-function)
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
;;; Overlays
|
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
(ediff-defvar-local ediff-current-diff-overlay-A nil
|
|
|
|
"Overlay for the current difference region in buffer A.")
|
|
|
|
(ediff-defvar-local ediff-current-diff-overlay-B nil
|
|
|
|
"Overlay for the current difference region in buffer B.")
|
|
|
|
(ediff-defvar-local ediff-current-diff-overlay-C nil
|
|
|
|
"Overlay for the current difference region in buffer C.")
|
|
|
|
(ediff-defvar-local ediff-current-diff-overlay-Ancestor nil
|
|
|
|
"Overlay for the current difference region in the ancestor buffer.")
|
1997-07-31 04:04:23 +00:00
|
|
|
|
2014-07-25 05:37:07 -04:00
|
|
|
(defvar ediff-toggle-read-only-function 'read-only-mode
|
2011-10-23 11:38:23 +08:00
|
|
|
"Function to be used to toggle read-only status of the buffer.
|
|
|
|
If nil, Ediff tries using the command bound to C-x C-q.")
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-make-buffers-readonly-at-startup nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Make all variant buffers read-only when Ediff starts up.
|
1997-07-17 19:37:07 +00:00
|
|
|
This property can be toggled interactively."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'ediff)
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
;;; Misc
|
|
|
|
|
|
|
|
;; if nil, this silences some messages
|
2007-09-16 22:15:22 +00:00
|
|
|
(defvar ediff-verbose-p t)
|
1996-09-20 01:10:05 +00:00
|
|
|
|
2017-03-14 16:12:29 +09:00
|
|
|
(defcustom ediff-show-ancestor t
|
|
|
|
"If non-nil, show ancestor buffer in 3way merges and refine it."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'ediff-merge
|
|
|
|
:version "26.1")
|
|
|
|
|
|
|
|
;; Store orig value of `ediff-show-ancestor' when changed in
|
|
|
|
;; `ediff-toggle-show-ancestor' and restore it on exit.
|
|
|
|
(ediff-defvar-local ediff--show-ancestor-orig nil "")
|
|
|
|
|
1997-11-01 01:46:51 +00:00
|
|
|
(defcustom ediff-autostore-merges 'group-jobs-only
|
2008-12-03 05:48:14 +00:00
|
|
|
"Save the results of merge jobs automatically.
|
2007-01-10 15:24:06 +00:00
|
|
|
With value nil, don't save automatically. With value t, always
|
|
|
|
save. Anything else means save automatically only if the merge
|
|
|
|
job is part of a group of jobs, such as `ediff-merge-directory'
|
|
|
|
or `ediff-merge-directory-revisions'."
|
1999-11-01 07:16:15 +00:00
|
|
|
:type '(choice (const nil) (const t) (const group-jobs-only))
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff-merge)
|
|
|
|
(make-variable-buffer-local 'ediff-autostore-merges)
|
1996-09-20 01:10:05 +00:00
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
;; file where the result of the merge is to be saved. used internally
|
1996-09-20 01:10:05 +00:00
|
|
|
(ediff-defvar-local ediff-merge-store-file nil "")
|
2000-05-24 17:31:16 +00:00
|
|
|
|
|
|
|
(defcustom ediff-merge-filename-prefix "merge_"
|
2008-12-03 05:48:14 +00:00
|
|
|
"Prefix to be attached to saved merge buffers."
|
2000-05-24 17:31:16 +00:00
|
|
|
:type 'string
|
|
|
|
:group 'ediff-merge)
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
(defcustom ediff-no-emacs-help-in-control-buffer nil
|
2008-12-03 05:48:14 +00:00
|
|
|
"Non-nil means C-h should not invoke Emacs help in control buffer.
|
1997-07-17 19:37:07 +00:00
|
|
|
Instead, C-h would jump to previous difference."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'ediff)
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2020-03-21 07:59:05 +01:00
|
|
|
(define-obsolete-variable-alias 'ediff-temp-file-prefix
|
|
|
|
'temporary-file-directory "28.1")
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-11-01 01:46:51 +00:00
|
|
|
(defcustom ediff-temp-file-mode 384 ; u=rw only
|
2008-12-03 05:48:14 +00:00
|
|
|
"Mode for Ediff temporary files."
|
1997-11-01 01:46:51 +00:00
|
|
|
:type 'integer
|
|
|
|
:group 'ediff)
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; Metacharacters that have to be protected from the shell when executing
|
|
|
|
;; a diff/diff3 command.
|
1997-11-01 01:46:51 +00:00
|
|
|
(defcustom ediff-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
|
2020-12-19 17:26:58 +01:00
|
|
|
"Regexp matching characters that must be quoted with `\\' in shell command line.
|
1997-11-01 01:46:51 +00:00
|
|
|
This default should work without changes."
|
2019-12-21 18:52:06 +01:00
|
|
|
:type 'regexp
|
1997-11-01 01:46:51 +00:00
|
|
|
:group 'ediff)
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2020-03-21 07:59:05 +01:00
|
|
|
(defvar ediff-H-glyph nil)
|
|
|
|
(make-obsolete-variable 'ediff-H-glyph nil "28.1")
|
1996-02-16 06:36:35 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-07-17 19:37:07 +00:00
|
|
|
;; Temporary file used for refining difference regions in buffer A.
|
|
|
|
(ediff-defvar-local ediff-temp-file-A nil "")
|
|
|
|
;; Temporary file used for refining difference regions in buffer B.
|
|
|
|
(ediff-defvar-local ediff-temp-file-B nil "")
|
|
|
|
;; Temporary file used for refining difference regions in buffer C.
|
|
|
|
(ediff-defvar-local ediff-temp-file-C nil "")
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
(defun ediff-file-remote-p (file-name)
|
2005-02-19 04:46:24 +00:00
|
|
|
(file-remote-p file-name))
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
|
|
|
|
;; File for which we can get attributes, such as size or date
|
|
|
|
(defun ediff-listable-file (file-name)
|
|
|
|
(let ((handler (find-file-name-handler file-name 'file-local-copy)))
|
|
|
|
(or (null handler) (eq handler 'dired-handler-fn))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defsubst ediff-frame-unsplittable-p (frame)
|
1995-06-05 23:43:51 +00:00
|
|
|
(cdr (assq 'unsplittable (frame-parameters frame))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
(defsubst ediff-get-next-window (wind prev-wind)
|
2002-09-23 06:07:34 +00:00
|
|
|
(cond ((window-live-p wind) wind)
|
|
|
|
(prev-wind (next-window wind))
|
|
|
|
(t (selected-window))
|
|
|
|
))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defsubst ediff-kill-buffer-carefully (buf)
|
|
|
|
"Kill buffer BUF if it exists."
|
|
|
|
(if (ediff-buffer-live-p buf)
|
|
|
|
(kill-buffer (get-buffer buf))))
|
1996-09-20 01:10:05 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defsubst ediff-background-face (buf-type dif-num)
|
|
|
|
;; The value of dif-num is always 1- the one that user sees.
|
|
|
|
;; This is why even face is used when dif-num is odd.
|
1997-07-31 04:04:23 +00:00
|
|
|
(ediff-get-symbol-from-alist
|
2014-12-05 12:49:53 -05:00
|
|
|
buf-type (if (cl-oddp dif-num)
|
1997-07-31 04:04:23 +00:00
|
|
|
ediff-even-diff-face-alist
|
|
|
|
ediff-odd-diff-face-alist)
|
|
|
|
))
|
1997-05-31 01:10:39 +00:00
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
|
|
|
|
;; activate faces on diff regions in buffer
|
|
|
|
(defun ediff-paint-background-regions-in-one-buffer (buf-type unhighlight)
|
2000-10-31 18:05:59 +00:00
|
|
|
(let ((diff-vector
|
1997-07-31 04:04:23 +00:00
|
|
|
(eval (ediff-get-symbol-from-alist
|
|
|
|
buf-type ediff-difference-vector-alist)))
|
1996-09-20 01:10:05 +00:00
|
|
|
overl diff-num)
|
1999-11-01 07:16:15 +00:00
|
|
|
(mapcar (lambda (rec)
|
|
|
|
(setq overl (ediff-get-diff-overlay-from-diff-record rec)
|
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
|
|
|
diff-num (overlay-get overl 'ediff-diff-num))
|
|
|
|
(if (overlay-buffer overl)
|
1999-11-01 07:16:15 +00:00
|
|
|
;; only if overlay is alive
|
|
|
|
(ediff-set-overlay-face
|
|
|
|
overl
|
|
|
|
(if (not unhighlight)
|
|
|
|
(ediff-background-face buf-type diff-num))))
|
|
|
|
)
|
1996-09-20 01:10:05 +00:00
|
|
|
diff-vector)))
|
|
|
|
|
|
|
|
|
|
|
|
;; activate faces on diff regions in all buffers
|
|
|
|
(defun ediff-paint-background-regions (&optional unhighlight)
|
|
|
|
(ediff-paint-background-regions-in-one-buffer
|
|
|
|
'A unhighlight)
|
|
|
|
(ediff-paint-background-regions-in-one-buffer
|
|
|
|
'B unhighlight)
|
|
|
|
(ediff-paint-background-regions-in-one-buffer
|
|
|
|
'C unhighlight)
|
|
|
|
(ediff-paint-background-regions-in-one-buffer
|
|
|
|
'Ancestor unhighlight))
|
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; arg is a record for a given diff in a difference vector
|
|
|
|
;; this record is itself a vector
|
|
|
|
(defsubst ediff-clear-fine-diff-vector (diff-record)
|
|
|
|
(if diff-record
|
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
|
|
|
(mapc #'delete-overlay
|
|
|
|
(ediff-get-fine-diff-vector-from-diff-record diff-record))))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defsubst ediff-clear-fine-differences-in-one-buffer (n buf-type)
|
|
|
|
(ediff-clear-fine-diff-vector (ediff-get-difference n buf-type))
|
|
|
|
(ediff-set-fine-diff-vector n buf-type nil))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defsubst ediff-clear-fine-differences (n)
|
|
|
|
(ediff-clear-fine-differences-in-one-buffer n 'A)
|
|
|
|
(ediff-clear-fine-differences-in-one-buffer n 'B)
|
|
|
|
(if ediff-3way-job
|
|
|
|
(ediff-clear-fine-differences-in-one-buffer n 'C)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
(defsubst ediff-mouse-event-p (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
|
|
|
(string-match "mouse" (format "%S" (event-basic-type event))))
|
1995-10-06 00:55:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defsubst ediff-key-press-event-p (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
|
|
|
(or (char-or-string-p event) (symbolp event)))
|
1995-10-06 00:55:57 +00:00
|
|
|
|
|
|
|
(defun ediff-event-point (event)
|
|
|
|
(cond ((ediff-mouse-event-p 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-point (event-start event)))
|
1995-10-06 00:55:57 +00:00
|
|
|
((ediff-key-press-event-p event)
|
|
|
|
(point))
|
2007-12-06 17:56:42 +00:00
|
|
|
(t (error "Error"))))
|
1995-10-06 00:55:57 +00:00
|
|
|
|
|
|
|
(defun ediff-event-buffer (event)
|
|
|
|
(cond ((ediff-mouse-event-p 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
|
|
|
(window-buffer (posn-window (event-start event))))
|
1995-10-06 00:55:57 +00:00
|
|
|
((ediff-key-press-event-p event)
|
|
|
|
(current-buffer))
|
2007-12-06 17:56:42 +00:00
|
|
|
(t (error "Error"))))
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
|
Remove most of the XEmacs compat code from ediff*.el
* lisp/vc/ediff-diff.el (ediff-word-1): Remove XEmacs compat code
and declare compatibility functions for obsolete. Adjust all callers.
* lisp/vc/ediff-help.el (ediff-set-help-overlays):
* lisp/vc/ediff-hook.el:
(menu-bar-ediff-misc-menu, menu-bar-ediff-merge-menu)
(menu-bar-ediff-menu, menu-bar-ediff-merge-menu)
(menu-bar-epatch-menu, menu-bar-ediff-misc-menu):
* lisp/vc/ediff-init.el (ediff-device-type)
(ediff-window-display-p, ediff-has-face-support-p)
(ediff-has-toolbar-support-p, ediff-has-gutter-support-p)
(ediff-BAD-INFO, ediff-coding-system-for-write)
(ediff-read-event, ediff-overlayp, ediff-make-overlay)
(ediff-delete-overlay, ediff-color-display-p)
(ediff-display-pixel-width, ediff-display-pixel-height)
(ediff-region-help-echo, ediff-set-face-pixmap)
(ediff-paint-background-regions-in-one-buffer)
(ediff-clear-fine-diff-vector, ediff-mouse-event-p)
(ediff-key-press-event-p, ediff-event-point, )
(ediff-event-buffer, ediff-event-key, ediff-last-command-char)
(ediff-frame-iconified-p, ediff-frame-char-width)
(ediff-reset-mouse, ediff-frame-char-height)
(ediff-overlay-start, ediff-overlay-end, ediff-overlay-buffer)
(ediff-overlay-get, ediff-move-overlay, ediff-overlay-put)
(ediff-abbreviate-file-name):
* lisp/vc/ediff-mult.el (ediff-next-meta-item)
(ediff-previous-meta-item)
(ediff-replace-session-activity-marker-in-meta-buffer)
(ediff-replace-session-status-in-meta-buffer)
(ediff-redraw-directory-group-buffer)
(ediff-update-markers-in-dir-meta-buffer)
(ediff-update-session-marker-in-dir-meta-buffer)
(ediff-redraw-registry-buffer, ediff-set-meta-overlay)
(ediff-update-meta-buffer, ediff-get-meta-info)
(ediff-get-meta-overlay-at-pos, )
(ediff-get-session-number-at-pos, )
(ediff-next-meta-overlay-start)
(ediff-previous-meta-overlay-start, )
(ediff-meta-mark-equal-files):
* lisp/vc/ediff-util.el:
(ediff-setup, ediff-setup-control-buffer, ediff-recenter)
(ediff-recenter-one-window, ediff-toggle-read-only)
(ediff-file-checked-out-p, ediff-file-checked-in-p)
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-kill-bottom-toolbar)
(ediff-visible-region, ediff-scroll-vertically)
(ediff-scroll-horizontally, ediff-jump-to-difference-at-point)
(ediff-diff-to-diff, ediff-restore-diff)
(ediff-toggle-regexp-match, ediff-really-quit)
(ediff-cleanup-mess, ediff-highlight-diff-in-one-buffer)
(ediff-unhighlight-diffs-totally-in-one-buffer)
(ediff-save-buffer, ediff-make-cloned-buffer)
(ediff-make-indirect-buffer, ediff-remove-flags-from-buffer)
(ediff-place-flags-in-buffer1, ediff-get-diff-posn)
(ediff-clear-diff-vector, ediff-make-bullet-proof-overlay)
(ediff-submit-report, ediff-deactivate-mark)
(ediff-activate-mark, ediff-profile, ediff-print-diff-vector):
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters)
(ediff-get-window-by-clicking, ediff-select-lowest-window)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-destroy-control-frame, ediff-make-frame-position)
(ediff-make-wide-display, ediff-get-visible-buffer-window):
* lisp/vc/ediff.el (ediff-version, ediff-documentation):
2019-10-05 16:48:44 +02:00
|
|
|
(define-obsolete-function-alias 'ediff-event-key #'identity "27.1")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2009-11-22 03:14:14 +00:00
|
|
|
(defun ediff-last-command-char ()
|
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
|
|
|
(declare (obsolete nil "27.1"))
|
|
|
|
last-command-event)
|
2009-11-22 03:14:14 +00:00
|
|
|
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defsubst ediff-frame-iconified-p (frame)
|
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
|
|
|
(and (ediff-window-display-p)
|
|
|
|
(frame-live-p frame)
|
|
|
|
(eq (frame-visible-p frame) 'icon)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defsubst ediff-window-visible-p (wind)
|
1995-06-05 23:43:51 +00:00
|
|
|
;; under TTY, window-live-p also means window is visible
|
1995-03-16 22:34:51 +00:00
|
|
|
(and (window-live-p wind)
|
1995-06-05 23:43:51 +00:00
|
|
|
(or (not (ediff-window-display-p))
|
|
|
|
(frame-visible-p (window-frame wind)))))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
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
|
|
|
(define-obsolete-function-alias 'ediff-frame-char-width
|
|
|
|
#'frame-char-width "27.1")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
(defun ediff-reset-mouse (&optional frame do-not-grab-mouse)
|
|
|
|
(or frame (setq frame (selected-frame)))
|
1995-06-05 23:43:51 +00:00
|
|
|
(if (ediff-window-display-p)
|
1995-10-06 00:55:57 +00:00
|
|
|
(let ((frame-or-wind frame))
|
|
|
|
(or do-not-grab-mouse
|
|
|
|
;; don't set mouse if the user said to never do this
|
2000-10-31 18:05:59 +00:00
|
|
|
(not ediff-grab-mouse)
|
1995-10-06 00:55:57 +00:00
|
|
|
;; Don't grab on quit, if the user doesn't want to.
|
|
|
|
;; If ediff-grab-mouse = t, then mouse won't be grabbed for
|
|
|
|
;; sessions that are not part of a group (this is done in
|
1999-11-01 07:16:15 +00:00
|
|
|
;; ediff-recenter). The condition below affects only terminating
|
1996-01-04 23:33:39 +00:00
|
|
|
;; sessions in session groups (in which case mouse is warped into
|
1995-10-06 00:55:57 +00:00
|
|
|
;; a meta buffer).
|
|
|
|
(and (eq ediff-grab-mouse 'maybe)
|
|
|
|
(memq this-command '(ediff-quit ediff-update-diffs)))
|
|
|
|
(set-mouse-position frame-or-wind 1 0))
|
|
|
|
)))
|
|
|
|
|
|
|
|
(defsubst ediff-spy-after-mouse ()
|
|
|
|
(setq ediff-mouse-pixel-position (mouse-pixel-position)))
|
|
|
|
|
1996-02-16 06:36:35 +00:00
|
|
|
;; It is not easy to find out when the user grabs the mouse, since emacs and
|
1999-11-01 07:16:15 +00:00
|
|
|
;; xemacs behave differently when mouse is not in any frame. Also, this is
|
1996-02-16 06:36:35 +00:00
|
|
|
;; sensitive to when the user grabbed mouse. Not used for now.
|
1995-10-06 00:55:57 +00:00
|
|
|
(defun ediff-user-grabbed-mouse ()
|
|
|
|
(if ediff-mouse-pixel-position
|
|
|
|
(cond ((not (eq (car ediff-mouse-pixel-position)
|
|
|
|
(car (mouse-pixel-position)))))
|
|
|
|
((and (car (cdr ediff-mouse-pixel-position))
|
|
|
|
(car (cdr (mouse-pixel-position)))
|
|
|
|
(cdr (cdr ediff-mouse-pixel-position))
|
|
|
|
(cdr (cdr (mouse-pixel-position))))
|
|
|
|
(not (and (< (abs (- (car (cdr ediff-mouse-pixel-position))
|
|
|
|
(car (cdr (mouse-pixel-position)))))
|
1996-01-04 23:33:39 +00:00
|
|
|
ediff-mouse-pixel-threshold)
|
1995-10-06 00:55:57 +00:00
|
|
|
(< (abs (- (cdr (cdr ediff-mouse-pixel-position))
|
|
|
|
(cdr (cdr (mouse-pixel-position)))))
|
1996-01-04 23:33:39 +00:00
|
|
|
ediff-mouse-pixel-threshold))))
|
1995-10-06 00:55:57 +00:00
|
|
|
(t nil))))
|
2000-10-31 18:05:59 +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
|
|
|
(define-obsolete-function-alias 'ediff-frame-char-height
|
|
|
|
#'frame-char-height "27.1")
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
;; Some overlay functions
|
1995-03-16 22:34:51 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defsubst ediff-overlay-start (overl)
|
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 (overlayp overl)
|
|
|
|
(overlay-start overl)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1997-05-31 01:10:39 +00:00
|
|
|
(defsubst ediff-overlay-end (overl)
|
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 (overlayp overl)
|
|
|
|
(overlay-end overl)))
|
1997-05-31 01:10:39 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
(defsubst ediff-empty-overlay-p (overl)
|
|
|
|
(= (ediff-overlay-start overl) (ediff-overlay-end overl)))
|
1996-02-16 06:36:35 +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
|
|
|
(define-obsolete-function-alias 'ediff-overlay-buffer
|
|
|
|
#'overlay-buffer "27.1")
|
1996-02-16 06:36:35 +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
|
|
|
(define-obsolete-function-alias 'ediff-overlay-get #'overlay-get "27.1")
|
1996-09-20 01:10:05 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defun ediff-move-overlay (overlay beg end &optional 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 OVERLAY's buffer exists, call `move-overlay'."
|
|
|
|
(let ((buf (and overlay (overlay-buffer overlay))))
|
1996-09-20 01:10:05 +00:00
|
|
|
(if (ediff-buffer-live-p buf)
|
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
|
|
|
(move-overlay overlay beg end buffer)
|
1996-09-20 01:10:05 +00:00
|
|
|
;; buffer's dead
|
|
|
|
(if overlay
|
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
|
|
|
(delete-overlay overlay)))))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-overlay-put (overlay prop value)
|
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
|
|
|
"Calls `overlay-put', but checks if overlay's buffer exists."
|
|
|
|
(if (ediff-buffer-live-p (overlay-buffer overlay))
|
|
|
|
(overlay-put overlay prop value)
|
|
|
|
(delete-overlay overlay)))
|
1996-09-20 01:10:05 +00:00
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; temporarily uses DIR to abbreviate file name
|
|
|
|
;; if DIR is nil, use default-directory
|
1996-02-16 06:36:35 +00:00
|
|
|
(defun ediff-abbreviate-file-name (file &optional dir)
|
1995-10-06 00:55:57 +00:00
|
|
|
(cond ((stringp dir)
|
|
|
|
(let ((directory-abbrev-alist (list (cons dir ""))))
|
|
|
|
(abbreviate-file-name file)))
|
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
2002-01-08 04:36:01 +00:00
|
|
|
(t
|
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
|
|
|
(abbreviate-file-name file))))
|
1995-10-06 00:55:57 +00:00
|
|
|
|
|
|
|
;; Takes a directory and returns the parent directory.
|
1999-11-01 07:16:15 +00:00
|
|
|
;; does nothing to `/'. If the ARG is a regular file,
|
1995-10-06 00:55:57 +00:00
|
|
|
;; strip the file AND the last dir.
|
|
|
|
(defun ediff-strip-last-dir (dir)
|
|
|
|
(if (not (stringp dir)) (setq dir default-directory))
|
|
|
|
(setq dir (expand-file-name dir))
|
|
|
|
(or (file-directory-p dir) (setq dir (file-name-directory dir)))
|
|
|
|
(let* ((pos (1- (length dir)))
|
|
|
|
(last-char (aref dir pos)))
|
|
|
|
(if (and (> pos 0) (= last-char ?/))
|
|
|
|
(setq dir (substring dir 0 pos)))
|
|
|
|
(ediff-abbreviate-file-name (file-name-directory dir))))
|
|
|
|
|
1999-11-01 07:16:15 +00:00
|
|
|
(defsubst ediff-nonempty-string-p (string)
|
|
|
|
(and (stringp string) (not (string= string ""))))
|
|
|
|
|
1995-10-06 00:55:57 +00:00
|
|
|
(defun ediff-abbrev-jobname (jobname)
|
|
|
|
(cond ((eq jobname 'ediff-directories)
|
|
|
|
"Compare two directories")
|
|
|
|
((eq jobname 'ediff-files)
|
|
|
|
"Compare two files")
|
|
|
|
((eq jobname 'ediff-buffers)
|
|
|
|
"Compare two buffers")
|
|
|
|
((eq jobname 'ediff-directories3)
|
|
|
|
"Compare three directories")
|
|
|
|
((eq jobname 'ediff-files3)
|
|
|
|
"Compare three files")
|
|
|
|
((eq jobname 'ediff-buffers3)
|
|
|
|
"Compare three buffers")
|
|
|
|
((eq jobname 'ediff-revision)
|
|
|
|
"Compare file with a version")
|
|
|
|
((eq jobname 'ediff-directory-revisions)
|
|
|
|
"Compare dir files with versions")
|
|
|
|
((eq jobname 'ediff-merge-directory-revisions)
|
|
|
|
"Merge dir files with versions")
|
|
|
|
((eq jobname 'ediff-merge-directory-revisions-with-ancestor)
|
|
|
|
"Merge dir versions via ancestors")
|
|
|
|
(t
|
2000-11-24 08:15:11 +00:00
|
|
|
(capitalize
|
2005-07-04 02:00:10 +00:00
|
|
|
(subst-char-in-string ?- ?\s (substring (symbol-name jobname) 6))))
|
2000-11-24 08:15:11 +00:00
|
|
|
))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
|
|
|
|
1995-03-16 22:34:51 +00:00
|
|
|
;; If ediff modified mode line, strip the modification
|
|
|
|
(defsubst ediff-strip-mode-line-format ()
|
2012-02-19 16:14:30 +08:00
|
|
|
(and (consp mode-line-format)
|
|
|
|
(member (car mode-line-format)
|
|
|
|
'(" A: " " B: " " C: " " Ancestor: "))
|
|
|
|
(setq mode-line-format (nth 2 mode-line-format))))
|
1995-03-16 22:34:51 +00:00
|
|
|
|
|
|
|
;; Verify that we have a difference selected.
|
|
|
|
(defsubst ediff-valid-difference-p (&optional n)
|
|
|
|
(or n (setq n ediff-current-difference))
|
|
|
|
(and (>= n 0) (< n ediff-number-of-differences)))
|
2000-10-31 18:05:59 +00:00
|
|
|
|
2013-09-04 23:30:07 -04:00
|
|
|
(defsubst ediff-show-all-diffs (_n)
|
1995-03-16 22:34:51 +00:00
|
|
|
"Don't skip difference regions."
|
|
|
|
nil)
|
1995-10-06 00:55:57 +00:00
|
|
|
|
1995-10-14 03:14:11 +00:00
|
|
|
(defsubst ediff-message-if-verbose (string &rest args)
|
|
|
|
(if ediff-verbose-p
|
2019-06-21 01:16:54 -04:00
|
|
|
(apply #'message string args)))
|
1996-02-16 06:36:35 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(defun ediff-file-attributes (filename attr-number)
|
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
of Scott Bronson.
(ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions.
(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
Deleted functions.
(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
ex-token-list.
(viper-get-ex-address-subr): convert registers to char data type.
* viper-util.el (viper-int-to-char,viper-char-equal): new
functions.
(viper-memq-char): use viper-int-to-char.
(viper-file-checked-in-p): use vc-locking-user, if vc doesn't have
vc-locking-state.
(viper-read-key): use viper-read-key-sequence.
* viper.el (viper-major-mode-modifier-list): added
inferior-emacs-lisp-mode.
(this-major-mode-requires-vi-state): new function that uses simple
heuristics to decide if vi state is appropriate.
(set-viper-state-in-major-mode): use this-major-mode-requires-vi-state.
(viper-non-hook-settings): don't advise read-key-sequence.
(viper-read-key-sequence): new function that replaces the
previously used advice to read-key-sequence.
* viper-cmd.el (viper-test-com-defun,viper-exec-change,
viper-exec-Change,viper-execute-com,viper-insert,viper-append,
viper-Append,viper-Insert,viper-open-line,viper-Open-line,
viper-open-line-at-point,viper-substitute,viper-overwrite,
viper-replace-char-subr,viper-forward-word,viper-forward-Word):
got rid of the negative character hack.
(viper-escape-to-state,viper-replace-state-exit-cmd):
use viper-read-key-sequence.
(viper-envelop-ESC-key): no need for ad-get-orig-definition.
(viper-minibuffer-standard-hook,viper-read-string-with-history):
don't override existing minibuffer-setup-hook.
(viper-mark-point,viper-goto-mark-subr,viper-brac-function):
convert registers to char data type.
(viper-autoindent): use viper-indent-line.
* viper-keym.el: use viper-exec-key-in-emacs.
* viper.texi: Added credits, new commands, like :make.
* ediff-util.el: Copyright years.
(ediff-choose-syntax-table): New function.
(ediff-setup): Use ediff-choose-syntax-table.
(ediff-file-checked-out-p,ediff-file-checked-in-p): check if
vc-state is available.
(ediff-make-temp-file): use ediff-coding-system-for-write.
* ediff-init.el (ediff-with-syntax-table): New macro, uses
with-syntax-table.
(ediff-coding-system-for-read): from ediff-diff.el
(ediff-coding-system-for-write): new variable.
(ediff-highest-priority): fixed the bug having to do with disappearing
overlays.
(ediff-file-remote-p): use file-remote-p, if available.
(ediff-listable-file): new function.
(ediff-file-attributes): use ediff-listable-file.
* ediff-mult.el (ediff-meta-insert-file-info1): use
ediff-listable-file.
* ediff-ptch.el (ediff-prompt-for-patch-file): use
ediff-coding-system-for-read.
(ediff-patch-file-internal): use ediff-coding-system-for-write.
* ediff-diff.el (ediff-coding-system-for-read): moved to ediff-init.el.
(ediff-match-diff3-line,ediff-get-diff3-group): improved pattern.
* ediff.el: Date of last update, copyright years.
* ediff-wind (ediff-setup-control-frame): Nill->nil.
* ediff.texi: added clarifications, acknowledgements.
2001-07-21 05:28:24 +00:00
|
|
|
(if (ediff-listable-file filename)
|
|
|
|
(nth attr-number (file-attributes filename))
|
|
|
|
-1)
|
|
|
|
)
|
1997-05-31 01:10:39 +00:00
|
|
|
|
1996-06-22 01:54:34 +00:00
|
|
|
(defsubst ediff-file-size (filename)
|
|
|
|
(ediff-file-attributes filename 7))
|
|
|
|
(defsubst ediff-file-modtime (filename)
|
|
|
|
(ediff-file-attributes filename 5))
|
|
|
|
|
|
|
|
|
2021-02-04 08:16:33 +01:00
|
|
|
;;; Obsolete
|
|
|
|
|
1996-09-20 01:10:05 +00:00
|
|
|
(defun ediff-convert-standard-filename (fname)
|
2020-08-18 12:10:29 +02:00
|
|
|
(declare (obsolete convert-standard-filename "28.1"))
|
|
|
|
(convert-standard-filename fname))
|
1996-06-22 01:54:34 +00:00
|
|
|
|
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
|
|
|
(define-obsolete-function-alias 'ediff-with-syntax-table
|
|
|
|
#'with-syntax-table "27.1")
|
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
|
|
|
|
2021-02-04 08:16:33 +01:00
|
|
|
(define-obsolete-function-alias 'ediff-hide-face #'ignore "28.1")
|
|
|
|
|
2005-07-10 18:46:24 +00:00
|
|
|
(provide 'ediff-init)
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; ediff-init.el ends here
|