Merge branch 'master' into highlight_matches

1 files changed, 53 insertions, 51 deletions

diff --git a/helm-mode.el b/helm-mode.el
index b9341f4b..d2c38f2c 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -949,58 +949,60 @@ Can be used as value for `completion-in-region-function'."
                   (afun (plist-get completion-extra-properties :annotation-function))
                   (data (all-completions input collection predicate))
                   (init-space-suffix (unless helm-completion-in-region-fuzzy-match " "))
-                  (file-comp-p (helm-mode--in-file-completion-p input (car data)))
+                  (file-comp-p (helm-mode--in-file-completion-p input (car-safe data)))
                   ;; Completion-at-point and friends have no prompt.
-                  (result (helm-comp-read
-                           (or (and (boundp 'prompt) prompt) "Pattern: ")
-                           (if file-comp-p
-                               (cl-loop for f in data unless
-                                        (string-match "\\`\\.\\{1,2\\}/\\'" f)
-                                        collect f)
-                               (if afun
-                                   (mapcar (lambda (s)
-                                             (let ((ann (funcall afun s)))
-                                               (if ann
-                                                   (cons
-                                                    (concat
-                                                     s
-                                                     (propertize
-                                                      " " 'display
-                                                      (propertize
-                                                       ann
-                                                       'face 'completions-annotations)))
-                                                    s)
-                                                   s)))
-                                           data)
-                                   data))
-                           :name str-command
-                           :fuzzy helm-completion-in-region-fuzzy-match
-                           :nomark t
-                           :initial-input
-                           (cond ((and file-comp-p
-                                       (not (string-match "/\\'" input)))
-                                  (concat (helm-basename input)
-                                          (unless (string= input "")
-                                            init-space-suffix)))
-                                 ((string-match "/\\'" input) nil)
-                                 ((or (null require-match)
-                                      (stringp require-match))
-                                  input)
-                                 (t (concat input init-space-suffix)))
-                           :buffer buf-name
-                           :fc-transformer (append (list 'helm-cr-default-transformer)
-                                                   (list (lambda (candidates _source)
-                                                           (sort candidates 'helm-generic-sort-fn))))
-                           :exec-when-only-one t
-                           :quit-when-no-cand
-                           #'(lambda ()
-                               ;; Delay message to overwrite "Quit".
-                               (run-with-timer
-                                0.01 nil
-                                #'(lambda ()
-                                    (message "[No matches]")))
-                               t)       ; exit minibuffer immediately.
-                           :must-match require-match)))
+                  (result (if (stringp data)
+                              data
+                              (helm-comp-read
+                               (or (and (boundp 'prompt) prompt) "Pattern: ")
+                               (if file-comp-p
+                                   (cl-loop for f in data unless
+                                            (string-match "\\`\\.\\{1,2\\}/\\'" f)
+                                            collect f)
+                                   (if afun
+                                       (mapcar (lambda (s)
+                                                 (let ((ann (funcall afun s)))
+                                                   (if ann
+                                                       (cons
+                                                        (concat
+                                                         s
+                                                         (propertize
+                                                          " " 'display
+                                                          (propertize
+                                                           ann
+                                                           'face 'completions-annotations)))
+                                                        s)
+                                                       s)))
+                                               data)
+                                       data))
+                               :name str-command
+                               :fuzzy helm-completion-in-region-fuzzy-match
+                               :nomark t
+                               :initial-input
+                               (cond ((and file-comp-p
+                                           (not (string-match "/\\'" input)))
+                                      (concat (helm-basename input)
+                                              (unless (string= input "")
+                                                init-space-suffix)))
+                                     ((string-match "/\\'" input) nil)
+                                     ((or (null require-match)
+                                          (stringp require-match))
+                                      input)
+                                     (t (concat input init-space-suffix)))
+                               :buffer buf-name
+                               :fc-transformer (append (list 'helm-cr-default-transformer)
+                                                       (list (lambda (candidates _source)
+                                                               (sort candidates 'helm-generic-sort-fn))))
+                               :exec-when-only-one t
+                               :quit-when-no-cand
+                               #'(lambda ()
+                                   ;; Delay message to overwrite "Quit".
+                                   (run-with-timer
+                                    0.01 nil
+                                    #'(lambda ()
+                                        (message "[No matches]")))
+                                   t)   ; exit minibuffer immediately.
+                               :must-match require-match))))
              (when result
                (delete-region (if (and file-comp-p
                                        (save-excursion