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-wind.el | |
| parent | f1d9e41ab022358c5086227d5b267f3f35d27666 (diff) | |
| download | emacs-8ef09cb30a526f34236f6696d06a2848043685ae.tar.gz emacs-8ef09cb30a526f34236f6696d06a2848043685ae.tar.bz2 emacs-8ef09cb30a526f34236f6696d06a2848043685ae.zip | |
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-wind.el')
| -rw-r--r-- | lisp/vc/ediff-wind.el | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index d4a60a16df1..7ca3941a375 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -959,7 +959,7 @@ create a new splittable frame if none is found." ediff-control-frame ctl-frame) ;; protect against undefined face-attribute (condition-case nil - (if (and (featurep 'emacs) (face-attribute 'mode-line :box)) + (if (face-attribute 'mode-line :box) (set-face-attribute 'mode-line ctl-frame :box nil)) (error))) @@ -1257,18 +1257,11 @@ It assumes that it is called from within the control buffer." (defun ediff-refresh-control-frame () - (if (featurep 'emacs) - ;; set frame/icon titles for Emacs - (modify-frame-parameters - ediff-control-frame - (list (cons 'title (ediff-make-base-title)) - (cons 'icon-name (ediff-make-narrow-control-buffer-id)) - )) - ;; set frame/icon titles for XEmacs - (setq frame-title-format (ediff-make-base-title) - frame-icon-title-format (ediff-make-narrow-control-buffer-id)) - ;; force an update of the frame title - (modify-frame-parameters ediff-control-frame '(())))) + ;; Set frame/icon titles. + (modify-frame-parameters + ediff-control-frame + (list (cons 'title (ediff-make-base-title)) + (cons 'icon-name (ediff-make-narrow-control-buffer-id))))) (defun ediff-make-narrow-control-buffer-id (&optional skip-name) |