branch: elpa/helm
commit 00eb4ef3a78a6f065c6e4649c9d505bbb47c756c
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Use now helm-x-icons-generic where needed (#2701)
---
helm-bookmark.el | 10 +++++-----
helm-buffers.el | 4 ++--
helm-files.el | 12 ++++++------
helm-imenu.el | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/helm-bookmark.el b/helm-bookmark.el
index 4b2f23590f..a7ba035003 100644
--- a/helm-bookmark.el
+++ b/helm-bookmark.el
@@ -670,14 +670,14 @@ If `browse-url-browser-function' is set to something else
than
(helm-basename isfile)
'dir))
(apply (car it) (cdr it))
- (helm-x-icons-octicon "file-directory")))
+ (helm-x-icons-generic "file-directory")))
((or isw3m iseww)
- (helm-x-icons-faicon "firefox"))
- ((and isfile isinfo) (helm-x-icons-octicon
"info"))
+ (helm-x-icons-generic "firefox"))
+ ((and isfile isinfo) (helm-x-icons-generic
"info"))
((or iswoman isman)
- (helm-x-icons-fileicon "man-page"))
+ (helm-x-icons-generic "man-page"))
((or isgnus ismu4e)
- (helm-x-icons-octicon "mail-read"))
+ (helm-x-icons-generic "mail-read"))
(isfile (helm-x-icons-icon-for-file
(helm-basename isfile)))))
;; Add a * if bookmark have annotation
if (and isannotation (not (string-equal isannotation "")))
diff --git a/helm-buffers.el b/helm-buffers.el
index 7515acddb9..be8657de5a 100644
--- a/helm-buffers.el
+++ b/helm-buffers.el
@@ -467,10 +467,10 @@ The list is reordered with `helm-buffer-list-reorder-fn'."
(and helm-x-icons-provider
(apply (cadr it) (cddr it)))
(cond ((eq type 'dired)
- (helm-x-icons-octicon "file-directory"))
+ (helm-x-icons-generic "file-directory"))
(buf-fname
(helm-x-icons-icon-for-file buf-name))
- (t (helm-x-icons-octicon "star" :v-adjust 0.0))))))
+ (t (helm-x-icons-generic "star" :v-adjust 0.0))))))
(buf-name (propertize buf-name 'face face1
'help-echo help-echo
'type type)))
diff --git a/helm-files.el b/helm-files.el
index 591ade7962..e8a6efcb11 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -4139,8 +4139,8 @@ returned prefixed with its icon or unchanged."
(if helm-ff-icon-mode
(helm-acase (match-string 1 disp)
("mailto:";
- (helm-x-icons-octicon "mail"))
- (t (helm-x-icons-octicon "link-external")))
+ (helm-x-icons-generic "mail"))
+ (t (helm-x-icons-generic "link-external")))
(propertize
" " 'display
(propertize "[@]" 'face 'helm-ff-prefix))))
@@ -4150,8 +4150,8 @@ returned prefixed with its icon or unchanged."
(setq prefix-new
(if helm-ff-icon-mode
(if (string-match "/\\'" disp)
- (helm-x-icons-material "create_new_folder")
- (helm-x-icons-material "note_add"))
+ (helm-x-icons-generic "create_new_folder")
+ (helm-x-icons-generic "note_add"))
(propertize
" " 'display
(propertize "[+]" 'face 'helm-ff-prefix))))
@@ -4436,7 +4436,7 @@ Arg FILE is the real part of candidate, a filename with
no props."
(helm-basename file)
'dir)
(apply (car it) (cdr it))
- (helm-x-icons-octicon "file-directory")))
+ (helm-x-icons-generic "file-directory")))
(;; All files, symlinks may be symlink directories.
(helm-ff--is-file-from-disp disp)
;; Detect symlink directories. We must call
@@ -4446,7 +4446,7 @@ Arg FILE is the real part of candidate, a filename with
no props."
(if (and (memq it '(helm-ff-symlink
helm-ff-dotted-symlink-directory))
(file-directory-p file))
- (helm-x-icons-octicon
"file-symlink-directory")
+ (helm-x-icons-generic
"file-symlink-directory")
(helm-x-icons-icon-for-file (helm-basename
file)))))))
(when icon (concat icon " ")))))
diff --git a/helm-imenu.el b/helm-imenu.el
index b658553ec3..9cf64f7eb2 100644
--- a/helm-imenu.el
+++ b/helm-imenu.el
@@ -274,7 +274,7 @@ The sexp should be an `all-the-icons' function with its
args."
(nerd-icons helm-imenu-nerd-icons-type-alist)))
(defcustom helm-imenu-default-type-sexp
- '(helm-x-icons-faicon "globe" :face font-lock-function-name-face)
+ '(helm-x-icons-generic "globe" :face font-lock-function-name-face)
"Default sexp to use when no type for an object is found."
:type 'sexp
:group 'helm-imenu)
