[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia aa41183 156/241: treat bookmarks as normal a
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia aa41183 156/241: treat bookmarks as normal alists |
Date: |
Fri, 28 May 2021 20:49:17 -0400 (EDT) |
branch: externals/marginalia
commit aa41183d7ce3ea7b01c06ea52e90c548ea039107
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
treat bookmarks as normal alists
---
marginalia.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index d430f9e..7c7058f 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -222,8 +222,8 @@ determine it."
;;;; Pre-declarations for external packages
-(declare-function bookmark-get-front-context-string "bookmark")
-(declare-function bookmark-get-filename "bookmark")
+(defvar bookmark-alist)
+(declare-function bookmark-get-bookmark-record "bookmark")
(defvar package--builtins)
(defvar package-archive-contents)
@@ -506,9 +506,10 @@ Similar to `marginalia-annotate-symbol', but does not show
symbol class."
(defun marginalia-annotate-bookmark (cand)
"Annotate bookmark CAND with its file name and front context string."
- (let ((front (bookmark-get-front-context-string cand)))
+ (when-let ((bm (bookmark-get-bookmark-record (assoc cand bookmark-alist)))
+ (front (alist-get 'front-context-string bm)))
(marginalia--fields
- ((bookmark-get-filename cand) :width 40 :face 'marginalia-file-name)
+ ((alist-get 'filename bm) :width 40 :face 'marginalia-file-name)
((if (or (not front) (string= front ""))
""
(concat (replace-regexp-in-string "\n" "\\\\n" front) "…"))
- [elpa] externals/marginalia c76b9d8 132/241: partially rewrite buffer annotator using format-mode-line, (continued)
- [elpa] externals/marginalia c76b9d8 132/241: partially rewrite buffer annotator using format-mode-line, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 6da7980 139/241: fix #39, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia cca0d4f 153/241: add marginalia-annotate-bookmark, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 4a727cd 158/241: fix #46: affixation suffix must not be nil, it must be a string, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 218881e 172/241: Replace consult-buffer annotator with consult-multi annotator, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 436cd05 175/241: consult--multi preserves the original candidate, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 548bf39 012/241: more explicit name for marginalia-command-annotate, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia bcb6bbb 022/241: Correct slight imprecision in docstring, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 642e25d 057/241: replace marginalia-separator-width by marginalia-separator, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia cb64b10 135/241: add comment, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia aa41183 156/241: treat bookmarks as normal alists,
Stefan Monnier <=
- [elpa] externals/marginalia 62ed158 183/241: Version 0.3, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia d2b43ed 189/241: Use project-roots (project-root is Emacs 28), Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 321feea 196/241: Increase marginalia-margin-threshold, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 1a65026 195/241: marginalia-annotate-buffer: Truncate mode-name to fix alignment, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 9d7f17f 199/241: Add marginalia-annotate-color (Fix #64), Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia b1e5139 226/241: README: Add contributions section, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2437a6f 230/241: marginalia-cycle: Check for affixation-function, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 844233c 239/241: Update readme, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia a78a4b3 149/241: fix headline, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 6c8b158 030/241: add license, Stefan Monnier, 2021/05/28