diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:48:59 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:50:31 -0800 |
| commit | 088bfcc2d80eed44864147f3491eff69e4eb5cd8 (patch) | |
| tree | a57599fb3064d09c38eec4ddd9cded8a3df72e6c /lisp/emacs-lisp/tabulated-list.el | |
| parent | 448df8fec7a7fb3fe558749591e657e8a84cb46b (diff) | |
| download | emacs-088bfcc2d80eed44864147f3491eff69e4eb5cd8.tar.gz emacs-088bfcc2d80eed44864147f3491eff69e4eb5cd8.tar.bz2 emacs-088bfcc2d80eed44864147f3491eff69e4eb5cd8.zip | |
Move “Fix some broken conditional forms” to master
Revert 2020-01-04T19:17:12Z!eggert@cs.ucla.edu
which recently I installed into the emacs-27 branch by mistake.
These patches are now on master instead (via merging).
Do not merge to master.
Diffstat (limited to 'lisp/emacs-lisp/tabulated-list.el')
| -rw-r--r-- | lisp/emacs-lisp/tabulated-list.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index b13f609f882..501cc3a29e0 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))) |