Merge pull request #289 from sandhu/master

Fix doctring indentation issue in #241

Author: bbatsov

clojure-mode.el

@@ -622,13 +622,14 @@ point) to check."
 (put 'definline 'clojure-doc-string-elt 2)
 (put 'defprotocol 'clojure-doc-string-elt 2)
 
-
 (defun clojure-indent-line ()
   "Indent current line as Clojure code."
   (if (clojure-in-docstring-p)
       (save-excursion
         (beginning-of-line)
-        (when (looking-at "^\\s-*")
+        (when (and (looking-at "^\\s-*")
+                   (<= (string-width (match-string-no-properties 0))
+                       (string-width (clojure-docstring-fill-prefix))))
           (replace-match (clojure-docstring-fill-prefix))))
     (lisp-indent-line)))
 

test/clojure-mode-indentation-test.el

@@ -107,6 +107,32 @@ values of customisable variables."
 (->>
  |expr)")
 
+(check-indentation doc-strings-without-indent-specified
+  "
+(defn some-fn
+|\"some doc string\""
+  "
+(defn some-fn
+  |\"some doc string\"")
+
+(check-indentation doc-strings-with-correct-indent-specified
+  "
+(defn some-fn
+  |\"some doc string\""
+  "
+(defn some-fn
+  |\"some doc string\"")
+
+(check-indentation doc-strings-with-additional-indent-specified
+  "
+(defn some-fn
+  |\"some doc string
+    - some note\""
+  "
+(defn some-fn
+  |\"some doc string
+    - some note\"")
+
 (provide 'clojure-mode-indentation-test)
 
 ;; Local Variables: