#
#
# patch "commands.cc"
#  from [e9e613f86dbf927a347ae4fdc1861440f93abde0]
#    to [53db2cdb172b6556d2055b56e1316c57de90fd98]
#
============================================================
--- commands.cc	e9e613f86dbf927a347ae4fdc1861440f93abde0
+++ commands.cc	53db2cdb172b6556d2055b56e1316c57de90fd98
@@ -212,15 +212,20 @@ namespace commands
             while (col++ < (col2 + 3))
               out << ' ';
           }
-        out << ' ' << idx(sorted, i)->name;
-        col += idx(sorted, i)->name.size() + 1;
-        if (col >= 70)
+
+        // Start new line if the current command could make the previous
+        // one wrap.  Indent it appropriately.
+        if (col + idx(sorted, i)->name.size() + 1 >= 79)
           {
             out << '\n';
             col = 0;
             while (col++ < (col2 + 3))
               out << ' ';
           }
+
+        // Print the current command name.
+        out << ' ' << idx(sorted, i)->name;
+        col += idx(sorted, i)->name.size() + 1;
       }
     out << "\n\n";
   }