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

[Basil L. Contovounesios]

branch: externals/ivy
commit a79ab912737af3124331ceb40f235dee738ed630
Merge: 80473bf 5f49149
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

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

diff --git a/ivy.el b/ivy.el
index 851d272..33cf95d 100644
--- a/ivy.el
+++ b/ivy.el
@@ -784,10 +784,11 @@ key (a string), cmd and doc (a string)."
            "\n")))
 
 (defun ivy-read-action-format-columns (actions)
-  "Create a docstring from ACTIONS, using several columns if needed to 
preserve `ivy-height'.
+  "Create a potentially multi-column docstring from ACTIONS.
+Several columns are used as needed to preserve `ivy-height'.
 
-ACTIONS is a list.  Each list item is a list of 3 items: key (a
-string), cmd and doc (a string)."
+ACTIONS is a list with elements of the form (KEY COMMAND DOC),
+where KEY and DOC are strings."
   (let ((length (length actions))
         (i 0)
         (max-rows (- ivy-height 1))