[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia 18cfe23 136/241: marginalia-annotate-virtual
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia 18cfe23 136/241: marginalia-annotate-virtual-buffer/marginalia-annotate-minor-mode: no narrow prefix |
Date: |
Fri, 28 May 2021 20:49:13 -0400 (EDT) |
branch: externals/marginalia
commit 18cfe2350347806d0cbb327a23695e0c1a6c2700
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
marginalia-annotate-virtual-buffer/marginalia-annotate-minor-mode: no
narrow prefix
Remove narrowing prefixes from Consult where possible.
Adapt Marginalia accordingly.
See https://github.com/minad/consult/issues/86
and
https://github.com/minad/consult/commit/86cb707407132248dcadb370b041ad4a95a42c8a.
---
marginalia.el | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index ca03c8a..bc89df7 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -320,7 +320,7 @@ This hash table is needed to speed up
`marginalia-annotate-binding'.")
(defun marginalia-annotate-virtual-buffer-class (cand)
"Annotate virtual-buffer CAND with the buffer class."
(marginalia--fields
- ((pcase (elt cand 0)
+ ((pcase (- (elt cand 0) #x100000)
(?b "Buffer")
(?f "File")
(?m "Bookmark")
@@ -330,12 +330,10 @@ This hash table is needed to speed up
`marginalia-annotate-binding'.")
;; This annotator is consult-specific, it will annotate the `consult-buffer'
command.
(defun marginalia-annotate-virtual-buffer-full (cand)
"Annotate virtual-buffer CAND with the buffer class."
- ;; Strip consult narrowing prefix
- (let ((cand-without-prefix (replace-regexp-in-string "^.[[:nonascii:]] " ""
cand)))
- (pcase (elt cand 0)
- (?b (marginalia-annotate-buffer cand-without-prefix))
- (?f (marginalia-annotate-file cand-without-prefix))
- (_ (marginalia-annotate-virtual-buffer-class cand)))))
+ (pcase (- (elt cand 0) #x100000)
+ (?b (marginalia-annotate-buffer (substring cand 1)))
+ (?f (marginalia-annotate-file (substring cand 1)))
+ (_ (marginalia-annotate-virtual-buffer-class cand))))
(defconst marginalia--advice-regexp
(rx bos
@@ -467,8 +465,7 @@ Similar to `marginalia-annotate-symbol', but does not show
symbol class."
(defun marginalia-annotate-minor-mode (cand)
"Annotate minor-mode CAND with status and documentation string."
- (let* ((cand (replace-regexp-in-string "^\\(.[[:nonascii:]] \\)+" "" cand))
;; Strip consult narrowing prefix
- (sym (intern-soft cand))
+ (let* ((sym (intern-soft cand))
(mode (if (and sym (boundp sym))
sym
(lookup-minor-mode-from-indicator cand)))
- [elpa] externals/marginalia ef325fc 073/241: In symbol annotator skip lines about advice in function docstring, (continued)
- [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, 2021/05/28
- [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 <=
- [elpa] externals/marginalia 3c80428 141/241: fix #41, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 0641467 144/241: convert readme to org in preparation of info file, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2a63616 148/241: update texi, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 4019935 157/241: rename virtual-buffer to consult-buffer, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 12fe439 161/241: right-fringe-width - use eq instead of =, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 327ad58 165/241: use aref instead of elt, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 5d15697 169/241: marginalia-annotate-bookmark with no front context still returns filename, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 64fe724 182/241: readme: do not use drawers to prevent export, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2387cba 186/241: marginalia-annotate-minor-mode: Support longer lighters, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 5159256 220/241: Fix external declaration for selectrum--get-full, Stefan Monnier, 2021/05/28