[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/vertico 9c210103c2 1/2: Revert "Remove vertico-director
From: |
ELPA Syncer |
Subject: |
[elpa] externals/vertico 9c210103c2 1/2: Revert "Remove vertico-directory--completing-file-p" (Fix #260) |
Date: |
Sun, 7 Aug 2022 17:58:02 -0400 (EDT) |
branch: externals/vertico
commit 9c210103c268ce43c9b152ba2e47f59e0dbc3c7d
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Revert "Remove vertico-directory--completing-file-p" (Fix #260)
This reverts commit 7ff368e5c0ca5d42252fc53071c8e239140ee552.
---
extensions/vertico-directory.el | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el
index 220a892b69..62879b5a08 100644
--- a/extensions/vertico-directory.el
+++ b/extensions/vertico-directory.el
@@ -40,6 +40,17 @@
(require 'vertico)
+(defun vertico-directory--completing-file-p ()
+ "Return non-nil when completing file names."
+ (eq 'file
+ (completion-metadata-get
+ (completion-metadata
+ (buffer-substring (minibuffer-prompt-end)
+ (max (minibuffer-prompt-end) (point)))
+ minibuffer-completion-table
+ minibuffer-completion-predicate)
+ 'category)))
+
;;;###autoload
(defun vertico-directory-enter ()
"Enter directory or exit completion with current candidate."
@@ -51,7 +62,7 @@
(string-suffix-p ":" cand))))
;; Check vertico--base for stepwise file path completion
(not (equal vertico--base ""))
- (eq 'file (vertico--metadata-get 'category)))
+ (vertico-directory--completing-file-p))
(vertico-insert)
(vertico-exit)))
@@ -61,7 +72,7 @@
(interactive "p")
(when (and (> (point) (minibuffer-prompt-end))
(eq (char-before) ?/)
- (eq 'file (vertico--metadata-get 'category)))
+ (vertico-directory--completing-file-p))
(let ((path (buffer-substring (minibuffer-prompt-end) (point))) found)
(when (string-match-p "\\`~[^/]*/\\'" path)
(delete-minibuffer-contents)