From: Juri Linkov <juri@linkov.net>
Date: Sat, 24 Dec 2022 18:04:56 +0000 (+0200)
Subject: * lisp/tab-bar.el: Fix the recent removal of substring as a gv-place.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4dc5bee98d5734b4f7113b961bafead1eb091bd0;p=emacs.git

* lisp/tab-bar.el: Fix the recent removal of substring as a gv-place.

(tab-bar-auto-width): Copy more logic from 'cl--set-substring' (bug#60297).
---

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 0bab3aba801..7433f5c8e51 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1116,7 +1116,8 @@ tab bar might wrap to the second line when it shouldn't.")
                           (del-pos2 (if close-p -1 nil)))
                       (while continue
                         (setq name (concat (substring name 0 del-pos1)
-                                           (substring name del-pos2)))
+                                           (and del-pos2
+                                                (substring name del-pos2))))
                         (setq curr-width (string-pixel-width name))
                         (if (and (> curr-width width)
                                  (< curr-width prev-width))