branch: externals/consult
commit e9fa6ab2258f015fad3d3e87764872125bc57374
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
consult--find-file-temporarily: Warn if variable is not defined (See #538)
---
consult.el | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/consult.el b/consult.el
index a6ffcaa996..6646f7b6f3 100644
--- a/consult.el
+++ b/consult.el
@@ -1126,18 +1126,20 @@ MARKER is the cursor position."
(defun consult--find-file-temporarily (name)
"Open file NAME temporarily for preview."
- (cl-letf ((orig (mapcar (pcase-lambda (`(,k . ,_))
- (list k
- (and (boundp k) (default-value k))
- (and (boundp k) (symbol-value k))))
- consult-preview-variables))
+ (cl-letf ((vars (delq nil
+ (mapcar (pcase-lambda (`(,k . ,v))
+ (if (boundp k)
+ (list k v (default-value k)
(symbol-value k))
+ (message "consult-preview-variables: The
variable `%s' is not bound" k)
+ nil))
+ consult-preview-variables)))
((default-value 'find-file-hook)
(seq-filter (lambda (x)
(memq x consult-preview-allowed-hooks))
(default-value 'find-file-hook))))
(unwind-protect
(progn
- (pcase-dolist (`(,k . ,v) consult-preview-variables)
+ (pcase-dolist (`(,k ,v . ,_) vars)
(set-default k v)
(set k v))
;; file-attributes may throw permission denied error
@@ -1148,7 +1150,7 @@ MARKER is the cursor position."
(message "File `%s' (%s) is too large for preview"
name (file-size-human-readable size))
nil)))
- (pcase-dolist (`(,k ,d ,v) orig)
+ (pcase-dolist (`(,k ,_ ,d ,v) vars)
(set-default k d)
(set k v)))))
