[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia d0c4e41 111/241: marginalia--field: fix nil
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia d0c4e41 111/241: marginalia--field: fix nil handling |
Date: |
Fri, 28 May 2021 20:49:07 -0400 (EDT) |
branch: externals/marginalia
commit d0c4e41b6aa773141dc27ec1bd583aa43b2c6022
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
marginalia--field: fix nil handling
---
marginalia.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index c0f113c..055d52a 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -276,10 +276,12 @@ FORMAT is a format string. This must be used if the field
value is not a string.
FACE is the name of the face, with which the field should be propertized.
WIDTH is the format width. This can be specified as alternative to FORMAT."
(cl-assert (not (and width format)))
- (when width (setq format (format "%%%ds" (- width))))
- (if format
- (setq field `(format ,format ,field))
- (setq field `(or ,field "")))
+ (when width
+ (setq field `(or ,field "")
+ format (format "%%%ds" (- width))))
+ (setq field (if format
+ `(format ,format ,field)
+ `(or ,field "")))
(when truncate (setq field `(marginalia--truncate ,field ,truncate)))
(when face (setq field `(propertize ,field 'face ,face)))
field)
- [elpa] externals/marginalia 74603c0 091/241: use mapatoms to fix the harmless unused variable warning, (continued)
- [elpa] externals/marginalia 74603c0 091/241: use mapatoms to fix the harmless unused variable warning, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 88ba686 090/241: remove unnecessary :group specification, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 6cd9768 098/241: minor optimization to marginalia--function-doc, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 4ac0f1f 096/241: rename variable, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia ed02f22 099/241: marginalia--align: only align text if non-empty, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 88faa59 089/241: marginalia-annotate-variable: ensure that control characters are escaped, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 333ff80 104/241: fix #32, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 531fb6e 107/241: fix #27, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia ef4fabf 106/241: add preliminary support for affixation-function, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 69332ba 110/241: fix hex code formatting, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia d0c4e41 111/241: marginalia--field: fix nil handling,
Stefan Monnier <=
- [elpa] externals/marginalia 7d9c6aa 117/241: binding hash: specify larger initial size, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia b69be18 119/241: marginalia-annotate-variable: add local indicator, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 5802a5d 118/241: readme: configuration example for selectrum refresh after marginalia-cycle, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia cf9f411 125/241: marginalia: always run annotators in the original window context, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia c574a26 054/241: more colors!, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2b85b73 130/241: fix marginalia--full-candidate, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 3ec73cd 138/241: Merry Christmas, MELPA!, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 5129917 150/241: fix readme, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2f849d8 013/241: Simplify marginalia--completion-metadata-get, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia c97911b 021/241: All classifiers from Embark have been imported, remove TODO, Stefan Monnier, 2021/05/28