[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia 95c0bb3 205/241: Go back and use full minibu
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia 95c0bb3 205/241: Go back and use full minibuffer-contents for marginalia--full-file |
Date: |
Fri, 28 May 2021 20:49:27 -0400 (EDT) |
branch: externals/marginalia
commit 95c0bb3a39e9b3db0719aa695efb36291f49e8fe
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Go back and use full minibuffer-contents for marginalia--full-file
(Partial revert of 06ae3b4c466801962b7611c851e62bf0c749fbbf)
Otherwise we get oddly disappearing annotations in Vertico when moving the
cursor as observed by @protesilaos in
https://github.com/minad/vertico/pull/7.
The argument is that the minibuffer contents are otherwise unchanged and as
such
should not affect the computation of the full candidate.
@oantolin, do you strongly disagree with this change?
---
marginalia.el | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index ffc68b2..446b1a6 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -646,15 +646,12 @@ The string is transformed according to
`marginalia-bookmark-type-transformers'."
(if-let (win (active-minibuffer-window))
(with-current-buffer (window-buffer win)
(let* ((contents (minibuffer-contents-no-properties))
- (pt (- (point) (minibuffer-prompt-end)))
- (before (substring contents 0 pt))
- (after (substring contents pt))
(bounds (completion-boundaries
- before
+ contents
minibuffer-completion-table
minibuffer-completion-predicate
- after))
- (components (split-string (substring before 0 (car bounds))
"/"))
+ ""))
+ (components (split-string (substring contents 0 (car bounds))
"/"))
(num-replace (if (string-suffix-p "/" file)
(cl-count ?/ file)
(1+ (cl-count ?/ file))) ))
- [elpa] externals/marginalia 091895b 092/241: fix #23, (continued)
- [elpa] externals/marginalia 091895b 092/241: fix #23, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 331b24a 093/241: check default-boundp too, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2864c8e 105/241: fix #31, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 5052240 114/241: annotate-buffer: use mode-name instead of major-mode, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia c1296db 108/241: introduce marginalia-margin-min, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia db18b0e 152/241: Add support for hidden consult buffers, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 6057427 164/241: autocompute marginalia-align-offset if it is not overwritten, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 206518b 163/241: add marginalia-align-offset, Stefan Monnier, 2021/05/28
- [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 <=
- [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, 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