branch: elpa/helm
commit 47fc44296564c3be8bc7353ecfc6e949b0f60e82
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Try to shut up persistent tramp error with adb method
when adding tilde to path.
---
helm-files.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/helm-files.el b/helm-files.el
index d9a11d3a5a..8def1fb2c9 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -2810,10 +2810,12 @@ when `helm-pattern' is equal to \"~/\"."
(let* ((history-p (string= (assoc-default 'name src)
"Read File Name History"))
(pat (helm-ff-set-pattern helm-pattern))
- (completed-p (string= (file-name-as-directory
- (expand-file-name
- (substitute-in-file-name pat)))
- helm-ff-default-directory))
+ (tramp-tolerate-tilde (equal (file-remote-p pat 'method)
+ tramp-adb-method))
+ (completed-p (helm-aand (expand-file-name
+ (substitute-in-file-name pat))
+ (string= (file-name-as-directory it)
+ helm-ff-default-directory)))
(candnum (helm-get-candidate-number))
(lt2-p (and (<= candnum 2)
(>= (string-width (helm-basename helm-pattern))
2)))
