summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2020-01-05 11:44:48 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2020-01-05 11:44:48 -0800
commitf9094332287cf1434788f6407347265350ae5dd5 (patch)
treedd0405f108e95f376d8b2927666de63135dd5594 /lisp/emacs-lisp
parentbb2b857d1f03516e0923f3f4e18f5459fdfcf692 (diff)
parent448df8fec7a7fb3fe558749591e657e8a84cb46b (diff)
downloademacs-f9094332287cf1434788f6407347265350ae5dd5.tar.gz
emacs-f9094332287cf1434788f6407347265350ae5dd5.tar.bz2
emacs-f9094332287cf1434788f6407347265350ae5dd5.zip
Merge from origin/emacs-27
448df8fec7 Improve doc-strings of 'quit-window' and 'quit-restore-win... 7f01dfca56 Fix MH-E bug #470: Show buffer discards text properties f95a2b8301 Fix some broken conditional forms 28727444f1 Fix a scoping error in tramp-sudoedit.el 6cbdd048bd * lisp/autorevert.el (auto-revert-notify-handler): Fix bra... 076dd1f69a Fix typo in 'window_box_height'
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/tabulated-list.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 501cc3a29e0..b13f609f882 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -547,10 +547,10 @@ Return the column number after insertion."
;; Don't truncate to `width' if the next column is align-right
;; and has some space left, truncate to `available-space' instead.
(when (and not-last-col
- (> label-width available-space)
- (setq label (truncate-string-to-width
- label available-space nil nil t t)
- label-width available-space)))
+ (> label-width available-space))
+ (setq label (truncate-string-to-width
+ label available-space nil nil t t)
+ label-width available-space))
(setq label (bidi-string-mark-left-to-right label))
(when (and right-align (> width label-width))
(let ((shift (- width label-width)))