[nongnu] elpa/helm fc3225e0dc 2/2: Fix issue #2562 - Ensure all-the-icons package is installed

[ELPA Syncer]

branch: elpa/helm
commit fc3225e0dc7b5be25308885eaebbbeb407293734
Author: Thierry Volpiatto <thievol@posteo.net>
Commit: Thierry Volpiatto <thievol@posteo.net>

    Fix issue #2562 - Ensure all-the-icons package is installed
    
    This prevent users ignoring errors when enabling helm-ff-icon-mode in
    their config.
---
 helm-files.el | 2 ++
 helm-mode.el  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/helm-files.el b/helm-files.el
index 973e2dbd44..250df00340 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5243,6 +5243,8 @@ When no suitable place to drop is found ask to drop to
 
 Use it for non-interactive calls of `helm-find-files'."
   (require 'tramp)
+  (unless (featurep 'all-the-icons)
+    (helm-ff-icon-mode -1))
   ;; Resolve FNAME now outside of helm.
   ;; [FIXME] When `helm-find-files-1' is used directly from lisp
   ;; and FNAME is an abbreviated path, for some reasons
diff --git a/helm-mode.el b/helm-mode.el
index db8b2f059d..b9d6d2e031 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -1460,6 +1460,7 @@ Keys description:
                                                          
helm-ff-maybe-show-thumbnails
                                                          
helm-ff-sort-candidates
                                                          ,(and 
helm-ff-icon-mode
+                                                               (featurep 
'all-the-icons)
                                                                
'helm-ff-icons-transformer)))
              :persistent-action-if persistent-action-if
              :persistent-help persistent-help