[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia 6da7980 139/241: fix #39
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia 6da7980 139/241: fix #39 |
Date: |
Fri, 28 May 2021 20:49:14 -0400 (EDT) |
branch: externals/marginalia
commit 6da7980bd5e6f30c9569d1d15d2f385072329798
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
fix #39
---
marginalia.el | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index d64cc3d..ef21f7d 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -27,8 +27,6 @@
;; Enrich existing commands with completion annotations
-;; Merry Christmas!
-
;;; Code:
(require 'subr-x)
@@ -325,6 +323,8 @@ This hash table is needed to speed up
`marginalia-annotate-binding'.")
((pcase (- (elt cand 0) #x100000)
(?b "Buffer")
(?f "File")
+ (?p "Project Buffer")
+ (?q "Project File")
(?m "Bookmark")
(?v "View"))
:width -8 :face 'marginalia-documentation)))
@@ -524,8 +524,18 @@ Similar to `marginalia-annotate-symbol', but does not show
symbol class."
marginalia--separator
(16 (:propertize mode-name face marginalia-mode)))
nil nil buffer))
- ((when-let (file (buffer-file-name buffer))
- (abbreviate-file-name file))
+ ((cond
+ ;; see ibuffer-buffer-file-name
+ ((when-let (file (buffer-file-name buffer))
+ (abbreviate-file-name file)))
+ ((when-let (proc (get-buffer-process buffer))
+ (format "(%s %s)" proc (process-status proc))))
+ ((local-variable-p 'list-buffers-directory buffer)
+ (buffer-local-value 'list-buffers-directory buffer))
+ ((when-let (dir (and (local-variable-p 'dired-directory buffer)
+ (buffer-local-value 'dired-directory buffer)))
+ (expand-file-name (if (stringp dir) dir (car dir))
+ (buffer-local-value 'default-directory buffer)))))
:truncate (/ marginalia-truncate-width 2)
:face 'marginalia-file-name))))
- [elpa] externals/marginalia a5ce6aa 207/241: Work around `completion-boundaries' bug in Emacs 27.1, (continued)
- [elpa] externals/marginalia a5ce6aa 207/241: Work around `completion-boundaries' bug in Emacs 27.1, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia e41d939 206/241: Revert "Go back and use full minibuffer-contents for marginalia--full-file", Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 95c0bb3 205/241: Go back and use full minibuffer-contents for marginalia--full-file, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 0c2735e 214/241: Selectrum advice is unnecessary - post-command-hook performs the update, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 1a100ba 216/241: Add mail address to header, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 470e278 231/241: Restore obsolete variables, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia b6ca937 115/241: shorter mode name, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia cca8f9c 116/241: readme typo, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia d37e9a5 129/241: fix #33, Stefan Monnier, 2021/05/28
- [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 <=
- [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, 2021/05/28
- [elpa] externals/marginalia 62ed158 183/241: Version 0.3, Stefan Monnier, 2021/05/28