Merge pull request #334 from Malabarba/master

[Fix #331] Indentation in buffers without a final newline

Author: bbatsov

clojure-mode.el

@@ -788,7 +788,8 @@ This function also returns nil meaning don't specify the indentation."
         ((or (pred integerp) `(,method))
          (let ((pos -1))
            (condition-case nil
-               (while (<= (point) indent-point)
+               (while (and (<= (point) indent-point)
+                           (not (eobp)))
                  (clojure-forward-logical-sexp 1)
                  (cl-incf pos))
              ;; If indent-point is _after_ the last sexp in the

test/clojure-mode-indentation-test.el

@@ -28,6 +28,16 @@
 (require 'ert)
 (require 's)
 
+(ert-deftest dont-hang-on-eob ()
+  (with-temp-buffer
+    (insert "(let [a b]")
+    (clojure-mode)
+    (goto-char (point-max))
+    (should
+     (with-timeout (2)
+       (newline-and-indent)
+       t))))
+
 (defmacro check-indentation (description before after &optional var-bindings)
   "Declare an ert test for indentation behaviour.
 The test will check that the swift indentation command changes the buffer