summaryrefslogtreecommitdiff
path: root/helm-mode.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2020-04-26 07:34:48 +0200
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2020-04-26 07:34:48 +0200
commit3fddd8c425c918074a4bda9982ce90c29e45adbd (patch)
tree5d3c971981a5f96b7852b5f5420670161f28ea96 /helm-mode.el
parent0745fa347de4a2a83394dee8da99b092992b8d9b (diff)
Avoid error with candidates with an image as display (#2296).
Diffstat (limited to 'helm-mode.el')
-rw-r--r--helm-mode.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/helm-mode.el b/helm-mode.el
index 5b6b1fbb..673e3fcb 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -477,7 +477,10 @@ If COLLECTION is an `obarray', a TEST should be needed. See `obarray'."
(defun helm-comp-read--move-to-first-real-candidate ()
(helm-aif (helm-get-selection nil 'withprop)
- (when (string= (get-text-property 0 'display it) "[?]")
+ ;; Avoid error with candidates with an image as display (#2296).
+ (when (or (and (stringp it)
+ (string= (get-text-property 0 'display it) "[?]"))
+ (not (stringp it)))
(helm-next-line))))
(defun helm-cr-default (default cands)