From d60d96ffa0d1992b0177a34ff09aa7efea279862 Mon Sep 17 00:00:00 2001 From: Michael Heerdegen Date: Tue, 14 Jun 2022 15:09:31 +0200 Subject: [PATCH] Tune when to show "Quick Help" in Ediff mode-line * lisp/vc/ediff-wind.el (ediff-refresh-mode-lines): Decide whether to display "Quick Help" in the mode-line based on the value of `ediff-use-long-help-message' instead of checking `ediff-window-setup-function' (Bug#12840). --- lisp/vc/ediff-wind.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 4549b910b13..6db3667545e 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1136,9 +1136,7 @@ It assumes that it is called from within the control buffer." (if (ediff-narrow-control-frame-p) (list " " mode-line-buffer-identification) (list "-- " mode-line-buffer-identification - (and (not (eq ediff-window-setup-function - 'ediff-setup-windows-plain)) - " Quick Help")))) + (list 'ediff-use-long-help-message " Quick Help")))) ;; control buffer id (setq mode-line-buffer-identification (if (ediff-narrow-control-frame-p) -- 2.39.2