diff --git a/elisp/shm-indent.el b/elisp/shm-indent.el
index 831169e..17f9d51 100644
--- a/elisp/shm-indent.el
+++ b/elisp/shm-indent.el
@@ -147,11 +147,21 @@ hai = do foo bar
    ((or (= (line-beginning-position)
            (line-end-position))
         (not (shm-current-node)))
-    (if (= (line-beginning-position)
-           (line-end-position))
-        (newline)
+    (cond
+     ((= (line-beginning-position)
+         (line-end-position))
+      (newline))
+     ((save-excursion
+        (move-beginning-of-line nil)
+        (looking-at "--"))
       (progn (newline)
-             (shm/simple-indent))))
+             (shm/simple-indent)
+             (save-excursion
+               (move-beginning-of-line nil)
+               (insert "--")
+               (delete-char 2))))
+     (t (progn (newline)
+               (shm/simple-indent)))))
    ((and (shm-in-string)
          (not (= (shm-node-start (shm-current-node))
                  (point))))