From c1269e711481290a52f0e316a194145b55f18ad8 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 20 Nov 2020 16:19:14 +0100 Subject: [PATCH] Remove some XEmacs compat code from ediff-wind.el * lisp/vc/ediff-wind.el (ediff-window) (ediff-compute-toolbar-width): Remove some XEmacs compat code. --- lisp/vc/ediff-wind.el | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index a23d72070ab..c68dc718843 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -42,13 +42,6 @@ (require 'ediff-help) ;; end pacifier - -;; be careful with ediff-tbar -(eval-and-compile - (if (featurep 'xemacs) - (require 'ediff-tbar) - (defun ediff-compute-toolbar-width () 0))) - (defgroup ediff-window nil "Ediff window manipulation." :prefix "ediff-" @@ -961,8 +954,7 @@ create a new splittable frame if none is found." ;; 1 more line for the mode line (setq lines (1+ (count-lines (point-min) (point-max))) fheight lines - fwidth (max (+ (ediff-help-message-line-length) 2) - (ediff-compute-toolbar-width)) + fwidth (max (+ (ediff-help-message-line-length) 2) 0) adjusted-parameters (list ;; possibly change surrogate minibuffer @@ -1291,6 +1283,9 @@ It assumes that it is called from within the control buffer." (ediff-multiframe-setup-p) ediff-wide-display-p))))))) +(defun ediff-compute-toolbar-width () + (declare (obsolete nil "28.1")) + 0) (provide 'ediff-wind) ;;; ediff-wind.el ends here -- 2.39.5