diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-10-04 15:20:41 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-10-04 15:20:48 +0200 |
| commit | 8ef09cb30a526f34236f6696d06a2848043685ae (patch) | |
| tree | 9aa39b5cab931781cf4ae758c07b7e0fee71d1f9 /lisp/vc/ediff-mult.el | |
| parent | f1d9e41ab022358c5086227d5b267f3f35d27666 (diff) | |
| download | emacs-8ef09cb30a526f34236f6696d06a2848043685ae.tar.gz | |
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.
Diffstat (limited to 'lisp/vc/ediff-mult.el')
| -rw-r--r-- | lisp/vc/ediff-mult.el | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 66d14e6b06d..3a869bff3e4 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -154,8 +154,7 @@ Useful commands (type ? to hide them and free up screen): (define-key map "\C-?" 'previous-line) (define-key map "p" 'previous-line) (define-key map "C" 'ediff-dir-diff-copy-file) - (define-key map (if (featurep 'emacs) [mouse-2] [button2]) - 'ediff-dir-diff-copy-file) + (define-key map [mouse-2] 'ediff-dir-diff-copy-file) (define-key map [delete] 'previous-line) (define-key map [backspace] 'previous-line) map) @@ -433,9 +432,7 @@ Toggled by ediff-toggle-verbose-help-meta-buffer" ) (if ediff-no-emacs-help-in-control-buffer (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item)) - (if (featurep 'emacs) - (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function) - (define-key ediff-meta-buffer-map [button2] ediff-meta-action-function)) + (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function) (use-local-map ediff-meta-buffer-map) ;; modify ediff-meta-buffer-map here @@ -1542,9 +1539,7 @@ Useful commands: (defun ediff-set-meta-overlay (b e prop &optional session-number hidden) (let (overl) (setq overl (ediff-make-overlay b e)) - (if (featurep 'emacs) - (ediff-overlay-put overl 'mouse-face 'highlight) - (ediff-overlay-put overl 'highlight t)) + (ediff-overlay-put overl 'mouse-face 'highlight) (ediff-overlay-put overl 'ediff-meta-info prop) (ediff-overlay-put overl 'invisible hidden) (ediff-overlay-put overl 'follow-link t) |