branch: elpa/helm
commit c667715fbd4277bd8662edb9404ee7dc37b63aee
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
Check basedir for icon in helm bookmark
---
helm-bookmark.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/helm-bookmark.el b/helm-bookmark.el
index d4831cc07c..848da91a13 100644
--- a/helm-bookmark.el
+++ b/helm-bookmark.el
@@ -611,9 +611,12 @@ If `browse-url-browser-function' is set to something else
than
i)
for icon = (when helm-bookmark-use-icon
(cond ((and isfile hff)
- (helm-aif (all-the-icons-match-to-alist
- (helm-basename isfile)
- all-the-icons-dir-icon-alist)
+ (helm-aif (or (all-the-icons-match-to-alist
+ (helm-basename (helm-basedir
isfile t))
+ all-the-icons-dir-icon-alist)
+ (all-the-icons-match-to-alist
+ (helm-basename isfile)
+ all-the-icons-dir-icon-alist))
(apply (car it) (cdr it))
(all-the-icons-octicon "file-directory")))
((and isfile isinfo) (all-the-icons-octicon
"info"))
