branch: externals/consult
commit af452dc5d429e15fb1228dd6967d592f1c483640
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Remove consult-recent-file-filter
This reverts commit 69bc425c59414ece0a49dfa8e3f2d9759a13748c.
It turns out there is almost no point in having a separate Consult filter
functionality for recent files. It is much better to filter out recent files
entirely with recentf-exclude.
---
CHANGELOG.org | 1 +
README.org | 1 -
consult.el | 29 +++++++++--------------------
3 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/CHANGELOG.org b/CHANGELOG.org
index 884e2c80d6..a824fdc75b 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -21,6 +21,7 @@
state function protocol changed. The function gets notified of more
completion
state changes. See the docstring of =consult--with-preview= for details.
- Remove unused =consult-preview-map=.
+- Remove unnecessary =consult-recent-file-filter=. Use =recentf-exclude=
instead.
* Version 0.16 (2022-03-08)
diff --git a/README.org b/README.org
index 3a338b4f36..c138db2bb2 100644
--- a/README.org
+++ b/README.org
@@ -933,7 +933,6 @@ an overview of all Consult variables and functions with
their descriptions.
| consult-preview-variables | Alist of variables to bind during preview
|
| consult-project-buffer-sources | List of virtual project buffer sources
|
| consult-project-function | Function which returns current project
root |
-| consult-recent-file-filter | Filter for =consult-recent-file=
|
| consult-register-prefix | Prefix string for register keys during
completion |
| consult-ripgrep-args | Command line arguments for ripgrep
|
| consult-themes | List of themes to be presented for
selection |
diff --git a/consult.el b/consult.el
index 5649314969..6f7f74d639 100644
--- a/consult.el
+++ b/consult.el
@@ -183,6 +183,10 @@ This is necessary in order to prevent a large startup time
for navigation commands like `consult-line'."
:type 'integer)
+(defvar consult-recent-file-filter nil)
+(make-obsolete-variable 'consult-recent-file-filter
+ "Deprecated in favor of `recentf-exclude'." "0.16")
+
(defcustom consult-buffer-filter
'("\\` "
"\\`\\*Completions\\*\\'"
@@ -195,10 +199,6 @@ The default setting is to filter ephemeral buffer names
beginning with a space
character, the *Completions* buffer and a few log buffers."
:type '(repeat regexp))
-(defcustom consult-recent-file-filter nil
- "Filter regexps for `consult-recent-file'."
- :type '(repeat regexp))
-
(defcustom consult-buffer-sources
'(consult--source-hidden-buffer
consult--source-buffer
@@ -3401,11 +3401,7 @@ narrowing and the settings `consult-goto-line-numbers'
and
(interactive)
(find-file
(consult--read
- (or (mapcar #'abbreviate-file-name
- (if-let (filter (and consult-recent-file-filter
- (consult--regexp-filter
consult-recent-file-filter)))
- (seq-remove (apply-partially #'string-match-p filter)
recentf-list)
- recentf-list))
+ (or (mapcar #'abbreviate-file-name recentf-list)
(user-error "No recent files, `recentf-mode' is %s"
(if recentf-mode "on" "off")))
:prompt "Find recent file: "
@@ -4198,8 +4194,7 @@ If NORECORD is non-nil, do not record the buffer switch
in the buffer list."
,(lambda ()
(when-let (root (consult--project-root))
(let ((len (length root))
- (ht (consult--buffer-file-hash))
- (filter (consult--regexp-filter consult-recent-file-filter)))
+ (ht (consult--buffer-file-hash)))
(mapcar (lambda (file)
(let ((part (substring file len)))
(put-text-property 0 (length part)
@@ -4207,9 +4202,7 @@ If NORECORD is non-nil, do not record the buffer switch
in the buffer list."
part))
(seq-filter (lambda (x)
(and (not (gethash x ht))
- (string-prefix-p root x)
- (not (and consult-recent-file-filter
- (string-match-p filter x)))))
+ (string-prefix-p root x)))
recentf-list))))))
"Project file candidate source for `consult-buffer'.")
@@ -4250,13 +4243,9 @@ If NORECORD is non-nil, do not record the buffer switch
in the buffer list."
:enabled ,(lambda () recentf-mode)
:items
,(lambda ()
- (let ((ht (consult--buffer-file-hash))
- (filter (consult--regexp-filter consult-recent-file-filter)))
+ (let ((ht (consult--buffer-file-hash)))
(mapcar #'abbreviate-file-name
- (seq-remove (lambda (x)
- (or (gethash x ht)
- (and consult-recent-file-filter
(string-match-p filter x))))
- recentf-list)))))
+ (seq-remove (lambda (x) (gethash x ht)) recentf-list)))))
"Recent file candidate source for `consult-buffer'.")
;;;###autoload
