[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 74dffcdf4f2 2/2: * lisp/tab-bar.el (tab-bar-auto-width): Don't ch
From: |
Juri Linkov |
Subject: |
master 74dffcdf4f2 2/2: * lisp/tab-bar.el (tab-bar-auto-width): Don't check if width changes. |
Date: |
Tue, 19 Sep 2023 13:52:17 -0400 (EDT) |
branch: master
commit 74dffcdf4f25ce4dc9074b0215f9967fb3e245a5
Author: Juri Linkov <juri@linkov.net>
Commit: Juri Linkov <juri@linkov.net>
* lisp/tab-bar.el (tab-bar-auto-width): Don't check if width changes.
Remove the condition '(< curr-width prev-width)' that was intended to check
if the width stopped to change. But actually it's not only unneeded,
but causes a bug: when the name contains a combining character, then
the width doesn't change, and the name truncation stops too early.
---
lisp/tab-bar.el | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index e4379b97d8b..d2815c03ebf 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1234,8 +1234,7 @@ tab bar might wrap to the second line when it shouldn't.")
space
(substring name ins-pos)))
(setq curr-width (string-pixel-width name))
- (if (and (< curr-width width)
- (> curr-width prev-width))
+ (if (< curr-width width)
(setq prev-width curr-width
prev-name name)
;; Set back a shorter name
@@ -1249,8 +1248,7 @@ tab bar might wrap to the second line when it shouldn't.")
(and del-pos2
(substring name del-pos2))))
(setq curr-width (string-pixel-width name))
- (if (and (> curr-width width)
- (< curr-width prev-width))
+ (if (> curr-width width)
(setq prev-width curr-width)
(setq continue nil)))
(let* ((len (length name))