hydra.el (hydra--format): Fix off-by-one

* hydra.el (hydra--hint): Don't add an extra newline.

* hydra-test.el (hydra-column-order): One newline less in expected string.
Also, re-indent the test code.

Fixes #303

hydra-test.el

@@ -1510,7 +1510,6 @@ h   l       (O)(o)
   j         (  O )
             (’’)(’’)
 
-
 firstcol    | secondcol
 ----------- | ------------
 e: exchange | r: reset
@@ -1523,18 +1522,18 @@ o: ok       | s: string
                    17 18 (face hydra-face-pink)
                    21 22 (face hydra-face-pink)
                    38 39 (face hydra-face-pink)
-                   129 130 (face hydra-face-pink)
+                   128 129 (face hydra-face-pink)
-                   143 144 (face hydra-face-pink)
+                   142 143 (face hydra-face-pink)
-                   152 153 (face hydra-face-pink)
+                   151 152 (face hydra-face-pink)
-                   166 167 (face hydra-face-pink)
+                   165 166 (face hydra-face-pink)
-                   174 175 (face hydra-face-pink)
+                   173 174 (face hydra-face-pink)
-                   188 189 (face hydra-face-pink)
+                   187 188 (face hydra-face-pink)
-                   196 197 (face hydra-face-blue)
+                   195 196 (face hydra-face-blue)
-                   210 211 (face hydra-face-pink)
+                   209 210 (face hydra-face-pink)
-                   234 235 (face hydra-face-pink)
+                   233 234 (face hydra-face-pink)
-                   244 246 (face hydra-face-pink)
+                   243 245 (face hydra-face-pink)
-                   270 272 (face hydra-face-pink)
+                   269 271 (face hydra-face-pink)
-                   296 298 (face hydra-face-pink)))))
+                   295 297 (face hydra-face-pink)))))
 
 ;; check column order is the same as they appear in defhydra
 (ert-deftest hydra-column-order ()

hydra.el

@@ -559,7 +559,7 @@ BODY, and HEADS are parameters to `defhydra'."
          (heads-w-col (cl-remove-if-not (lambda (heads) (hydra--head-property (nth 0 heads) :column)) sorted-heads))
          (heads-wo-col (cl-remove-if (lambda (heads) (hydra--head-property (nth 0 heads) :column)) sorted-heads)))
     (concat (when heads-w-col
-              (concat "\n" (hydra--hint-from-matrix body (hydra--generate-matrix heads-w-col))))
+              (hydra--hint-from-matrix body (hydra--generate-matrix heads-w-col)))
             (when heads-wo-col
               (hydra--hint-heads-wocol body (car heads-wo-col))))))
 
@@ -717,7 +717,7 @@ The expressions can be auto-expanded according to NAME."
                         (substring docstring (+ start offset 1 lspec varp))))))))
       (cond
         ((string= docstring "")
-         (substring rest 1))
+         rest)
         ((eq ?\n (aref docstring 0))
          `(concat (format ,(substring docstring 1) ,@(nreverse varlist))
                   ,rest))