[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia c37a2765b9: Drop Selectrum-specific workarou
From: |
ELPA Syncer |
Subject: |
[elpa] externals/marginalia c37a2765b9: Drop Selectrum-specific workaround to obtain the full candidate |
Date: |
Mon, 10 Oct 2022 08:58:02 -0400 (EDT) |
branch: externals/marginalia
commit c37a2765b97520203c7b842490717c7c08be468f
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Drop Selectrum-specific workaround to obtain the full candidate
See also
https://github.com/minad/consult/commit/162d7d73edb63faa7dd72fcffb20af42886de6e0
---
README.org | 5 ++---
marginalia.el | 16 ++++++----------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/README.org b/README.org
index 3225d52c00..4cec8a0361 100644
--- a/README.org
+++ b/README.org
@@ -34,9 +34,8 @@ with command =marginalia-cycle=.
* Configuration
It is recommended to use Marginalia together with either the
[[https://github.com/minad/vertico][Vertico]],
[[https://github.com/protesilaos/mct][Mct]],
-[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Icomplete.html][Icomplete]]
or the [[https://github.com/raxod502/selectrum][Selectrum]] completion system.
Furthermore Marginalia can be
-combined with [[https://github.com/oantolin/embark][Embark]] for action
support and [[https://github.com/minad/consult][Consult]], which provides many
useful
-commands.
+[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Icomplete.html][Icomplete]]
or the default completion UI. Furthermore Marginalia can be combined
+with [[https://github.com/oantolin/embark][Embark]] for action support and
[[https://github.com/minad/consult][Consult]], which provides many useful
commands.
#+begin_src emacs-lisp
;; Enable rich annotations using the Marginalia package
diff --git a/marginalia.el b/marginalia.el
index 44b6ac3998..a1b08533bb 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -306,8 +306,6 @@ determine it."
(declare-function color-rgb-to-hsl "color")
(declare-function color-hsl-to-rgb "color")
-(declare-function selectrum--get-full "ext:selectrum")
-
;;;; Marginalia mode
(defvar marginalia--candw-step 10
@@ -814,11 +812,9 @@ example, during file name completion the candidates are
one path
component of a full file path."
(if-let (win (active-minibuffer-window))
(with-current-buffer (window-buffer win)
- (if (bound-and-true-p selectrum-is-active)
- (selectrum--get-full cand)
- (concat (substring (minibuffer-contents-no-properties)
- 0 marginalia--base-position)
- cand)))
+ (concat (substring (minibuffer-contents-no-properties)
+ 0 marginalia--base-position)
+ cand))
;; no minibuffer is active, trust that cand already conveys all
;; necessary information (there's not much else we can do)
cand))
@@ -1104,9 +1100,9 @@ looking for a regexp that matches the prompt."
(defun marginalia--cached (cache fun key)
"Cached application of function FUN with KEY.
-The CACHE keeps around the last `marginalia--cache-size' computed annotations.
-The cache is mainly useful when scrolling in completion UIs like Vertico or
-Selectrum."
+The CACHE keeps around the last `marginalia--cache-size' computed
+annotations. The cache is mainly useful when scrolling in
+completion UIs like Vertico or Icomplete."
(if cache
(let ((ht (cdr cache)))
(or (gethash key ht)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/marginalia c37a2765b9: Drop Selectrum-specific workaround to obtain the full candidate,
ELPA Syncer <=