summaryrefslogtreecommitdiff
path: root/lisp/icomplete.el
diff options
context:
space:
mode:
authorJoão Távora <joaotavora@gmail.com>2021-06-05 21:46:59 +0100
committerJoão Távora <joaotavora@gmail.com>2021-06-05 21:47:57 +0100
commit45d711a356b4c5e75d0b6e4391313ca34f57b4bb (patch)
tree141007fa7d3cb9dbbe33d8584f603134e7dcd344 /lisp/icomplete.el
parent4fda37fc7d83a555c597269954b5717b874cf2ee (diff)
downloademacs-45d711a356b4c5e75d0b6e4391313ca34f57b4bb.tar.gz
Consider environment vars in Fido's directory-aware RET binding
Fixes: bug#48782 * lisp/icomplete.el (icomplete-fido-ret): Consider environment variables in dir expansion.
Diffstat (limited to 'lisp/icomplete.el')
-rw-r--r--lisp/icomplete.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 03a191cb0b6..08b4ef2030a 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -331,7 +331,8 @@ require user confirmation."
(file-name-directory (icomplete--field-string))))
(current (car completion-all-sorted-completions))
(probe (and dir current
- (expand-file-name (directory-file-name current) dir))))
+ (expand-file-name (directory-file-name current)
+ (substitute-env-vars dir)))))
(cond ((and probe (file-directory-p probe) (not (string= current "./")))
(icomplete-force-complete))
(t