From fd2300226809406ce68ca63096050a1b7379b267 Mon Sep 17 00:00:00 2001
From: Phil Jackson <phil@shellarchive.co.uk>
Date: Wed, 1 Sep 2010 21:33:57 +0100
Subject: [PATCH] Don't add a newline if a menu item is the last.

---
 magit-key-mode.el | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/magit-key-mode.el b/magit-key-mode.el
index 0b5ccd35..2325e2aa 100644
--- a/magit-key-mode.el
+++ b/magit-key-mode.el
@@ -341,17 +341,6 @@ put it in magit-key-mode-key-maps for fast lookup."
       (magit-key-mode-draw-header "Switches\n")
       (magit-key-mode-draw-in-cols switch-strs))))
 
-(defun magit-key-mode-draw-in-cols (strings)
-  (let ((longest-act (apply 'max (mapcar 'length strings)))
-        (max-size 70))
-    (dolist (str strings)
-      (let ((padding (make-string (- (+ longest-act 5) (length str)) ? )))
-        (insert str)
-        (if (> (+ (current-column) longest-act) max-size)
-            (insert "\n")
-          (insert padding))))
-    (insert "\n")))
-
 (defun magit-key-mode-draw-actions (actions)
   (when actions
     (let ((action-strs (mapcar
@@ -365,6 +354,20 @@ put it in magit-key-mode-key-maps for fast lookup."
       (magit-key-mode-draw-header "Actions\n")
       (magit-key-mode-draw-in-cols action-strs))))
 
+(defun magit-key-mode-draw-in-cols (strings)
+  "Given a list of strings, print in columns (using `insert')."
+  (let ((longest-act (apply 'max (mapcar 'length strings)))
+        (max-size 70))
+    (while strings
+      (let ((str (car strings)))
+        (let ((padding (make-string (- (+ longest-act 5) (length str)) ? )))
+          (insert str)
+          (if (and (> (+ (current-column) longest-act) max-size)
+                   (cdr strings))
+              (insert "\n")
+            (insert padding))))
+      (setq strings (cdr strings))))
+  (insert "\n"))
 
 (defun magit-key-mode-draw (for-group)
   "Function used to draw actions, switches and parameters."