@@ -291,18 +291,17 @@ Should be clojure.contrib.test-is or clojure.test." (clojure-test-load-reporting))) ;;;###autoload -(defun clojure-test-maybe-enable () - "Enable clojure-test-mode if the current buffer contains Clojure tests. +(progn + (defun clojure-test-maybe-enable () + "Enable clojure-test-mode if the current buffer contains Clojure tests. Also will enable it if the file is in a test directory." - (save-excursion - (goto-char (point-min)) - (if (or (search-forward "(deftest" nil t) - (search-forward "(with-test" nil t) - (string-match "/test/$" default-directory)) - (clojure-test-mode t)))) - -;;;###autoload -(add-hook 'clojure-mode-hook 'clojure-test-maybe-enable) + (save-excursion + (goto-char (point-min)) + (if (or (search-forward "(deftest" nil t) + (search-forward "(with-test" nil t) + (string-match "/test/$" default-directory)) + (clojure-test-mode t)))) + (add-hook 'clojure-mode-hook 'clojure-test-maybe-enable)) (provide 'clojure-test-mode) ;;; clojure-test-mode.el ends here clojure-test-mode.el @@ -1,5 +1,5 @@ -(ns clojure-mode.test-is - (:use clojure.contrib.test-is)) +(ns clojure-mode.test + (:use [clojure.test])) (deftest test-str (is (= "o hai" (str "o" "hai")))) test.clj 6b6e2b444dacae6806684cdc5c8fb16afd8f1e76 Phil Hagelberg technomancy@gmail.com http://github.com/jochu/clojure-mode/commit/f2771df1b4c98bca9362a960bdd6b14bf187ea1e f2771df1b4c98bca9362a960bdd6b14bf187ea1e 2009-09-23T16:20:06-07:00 2009-09-23T16:20:06-07:00 Move clojure-test-maybe-enable inside autoloaded progn. 8eb3b1c132a1e8d611cc474e4470937790bb7fb7 Phil Hagelberg technomancy@gmail.com