ivy.el (ivy-read): Fix extra actions for completing-read

Re #337
abo-abo · Jan 28, 2016 · c0c0f63 · c0c0f63
1 parent 8c2f213
commit c0c0f63
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/ivy.el b/ivy.el
@@ -1119,11 +1119,14 @@ customizations apply to the current completion session."
                                (plist-get ivy--actions-list this-command))))
     (when extra-actions
       (setq action
-            (if (functionp action)
-                `(1
-                  ("o" ,action "default")
-                  ,@extra-actions)
-              (delete-dups (append action extra-actions))))))
+            (cond ((functionp action)
+                   `(1
+                     ("o" ,action "default")
+                     ,@extra-actions))
+                  ((null action)
+                   (cons 1 extra-actions))
+                  (t
+                   (delete-dups (append action extra-actions)))))))
   (let ((recursive-ivy-last (and (active-minibuffer-window) ivy-last)))
     (setq ivy-last
           (make-ivy-state