[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia d2a7923 069/241: improve marginalia-annotate
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia d2a7923 069/241: improve marginalia-annotate-package, do not show nil for builtins |
Date: |
Fri, 28 May 2021 20:48:58 -0400 (EDT) |
branch: externals/marginalia
commit d2a79234c5873e7ab2b90f6cf7bddbdd61f2a9a5
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
improve marginalia-annotate-package, do not show nil for builtins
---
marginalia.el | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 5457914..2f7bc8f 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -85,10 +85,15 @@
:group 'marginalia)
(defface marginalia-archive
- '((t :inherit marginalia-key))
+ '((t :inherit warning))
"Face used to highlight package archives in `marginalia-mode'."
:group 'marginalia)
+(defface marginalia-installed
+ '((t :inherit success))
+ "Face used to highlight package status in `marginalia-mode'."
+ :group 'marginalia)
+
(defface marginalia-size
'((t :inherit font-lock-constant-face))
"Face used to highlight sizes in `marginalia-mode'."
@@ -197,12 +202,13 @@ determine it."
(defvar package--builtins)
(defvar package-alist)
(defvar package-archive-contents)
+(declare-function package--from-builtin "package")
+(declare-function package-desc-archive "package")
+(declare-function package-desc-dir "package")
(declare-function package-desc-summary "package")
(declare-function package-desc-version "package")
-(declare-function package-desc-archive "package")
(declare-function package-installed-p "package")
(declare-function package-version-join "package")
-(declare-function package--from-builtin "package")
;;;; Marginalia mode
@@ -335,9 +341,10 @@ This hash table is needed to speed up
`marginalia-annotate-command-binding'.")
(car (alist-get pkg package-archive-contents))))))
(marginalia--fields
((package-version-join (package-desc-version desc)) :width 16 :face
'marginalia-version)
- ((if (package-installed-p desc)
- "installed"
- (package-desc-archive desc)) :width 9 :face 'marginalia-archive)
+ ((cond
+ ((eq (package-desc-dir desc) 'builtin) (propertize "builtin" 'face
'marginalia-installed))
+ ((package-installed-p desc) (propertize "installed" 'face
'marginalia-installed))
+ (t (propertize (package-desc-archive desc) 'face 'marginalia-archive)))
:width 9)
((package-desc-summary desc) :truncate marginalia-truncate-width :face
'marginalia-documentation))))
(defun marginalia-annotate-customize-group (cand)
- [elpa] externals/marginalia 3559cbb 095/241: update readme, (continued)
- [elpa] externals/marginalia 3559cbb 095/241: update readme, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 27cd29d 101/241: add buffer size annotation, fix #29, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 3360875 113/241: Rename marginalia-cycle-annotators to marginalia-cycle, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 1fb2569 121/241: marginalia-annotate-minor-mode: fix support for consult, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 35cb523 127/241: add comment, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia d38a278 151/241: readme: do not export drawers, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 3febe72 155/241: fix #45, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 7d3f018 024/241: Add annotations for files and buffers, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia f083852 066/241: readme: add embark and consult links, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia ef325fc 073/241: In symbol annotator skip lines about advice in function docstring, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia d2a7923 069/241: improve marginalia-annotate-package, do not show nil for builtins,
Stefan Monnier <=
- [elpa] externals/marginalia 6e8ba6d 079/241: add marginalia-annotate-imenu, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia fbd898d 087/241: rename marginalia-annotate-command to marginalia-annotate-binding, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia e833584 103/241: improve marginalia-classify-symbol, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 40e2881 112/241: fix marginalia-cycle-annotators such that it works as an embark action, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia b1ccaf8 124/241: readme: more robust selectrum config, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 6a64a59 120/241: marginalia-annotate-minor-mode: add local/global indicator, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 4069094 131/241: get rid of marginalia--buffer-bytes, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 1f2a842 133/241: shorter mode-name, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 18cfe23 136/241: marginalia-annotate-virtual-buffer/marginalia-annotate-minor-mode: no narrow prefix, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 3c80428 141/241: fix #41, Stefan Monnier, 2021/05/28