Merge pull request #364 from clojure-emacs/indent-style

A couple of bug fixes

Author: bbatsov

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Bugs fixed
 
+* [#361](https://github.com/clojure-emacs/clojure-mode/issues/361): Fixed a typo preventing the highlighting of fn names that don't start with `t`.
 * [#360](https://github.com/clojure-emacs/clojure-mode/issues/360): `clojure-align` now reindents after aligning, which also fixes an issue with nested alignings.
 
 ### New features

clojure-mode.el

@@ -508,7 +508,7 @@ any number of matches of `clojure--sym-forbidden-rest-chars'."))
                 ;; Possibly type
                 "\\(?:#?^\\sw+[ \t]*\\)?"
                 ;; Possibly name
-                "\\(t\\sw+\\)?" )
+                "\\(\\sw+\\)?" )
        (1 font-lock-keyword-face)
        (2 font-lock-function-name-face nil t))
       ;; lambda arguments - %, %1, %2, etc
@@ -1118,7 +1118,7 @@ This function also returns nil meaning don't specify the indentation."
            (cond
             ;; Preserve useful alignment of :require (and friends) in `ns' forms.
             ((and function (string-match "^:" function))
-             (clojure--normal-indent last-sexp :align-arguments))
+             (clojure--normal-indent last-sexp :always-align))
             ;; This is should be identical to the :defn above.
             ((and function
                   (string-match "\\`\\(?:\\S +/\\)?\\(def[a-z]*\\|with-\\)"