[elpa] externals/ivy 1831495 2/2: Merge branch 'master' into externals/ivy

[Basil L. Contovounesios]

branch: externals/ivy
commit 18314955569cb7179017b9bd81ccba14614b0b7f
Merge: 93cabe2 6a8e561
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Merge branch 'master' into externals/ivy
---
 ivy.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ivy.el b/ivy.el
index c693ab7..851d272 100644
--- a/ivy.el
+++ b/ivy.el
@@ -855,7 +855,8 @@ selection, non-nil otherwise."
                                   (cdr actions)))
                 (not (string= key (car (nth action-idx (cdr actions))))))
       (setq key (concat key (key-description (vector (read-key hint))))))
-    (ivy-shrink-after-dispatching)
+    ;; Ignore resize errors with minibuffer-only frames (#2726).
+    (ignore-errors (ivy-shrink-after-dispatching))
     (cond ((member key '("ESC" "C-g" "M-o"))
            nil)
           ((null action-idx)