From 0002d4f31666719c5e972ca65efffc70750db613 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Fri, 28 Jul 2023 12:21:42 +0200
Subject: [PATCH] Avoid spurious whitespace in the modeline of emacsclient
 frames

* lisp/bindings.el (mode-line-client): Compute 'help-echotext
property in advance.  (Bug#58183)

(cherry picked from commit 8c3338f6ba354218aee12c223d778be4180f892b)
---
 lisp/bindings.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/bindings.el b/lisp/bindings.el
index f4881ac388c..6db043e495c 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -226,9 +226,9 @@ mnemonics of the following coding systems:
 (put 'mode-line-mule-info 'risky-local-variable t)
 
 (defvar mode-line-client
-  `(""
-    (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" "")))
-		 help-echo ,(purecopy "emacsclient frame")))
+  `(:eval
+    (if (frame-parameter nil 'client)
+	,(propertize "@" 'help-echo (purecopy "emacsclient frame"))))
   "Mode line construct for identifying emacsclient frames.")
 ;; Autoload if this file no longer dumped.
 ;;;###autoload
-- 
2.39.5