Merge branch 'master' of github.com:alexott/emacs-configs

alexott · Feb 24, 2010 · 28ec4dc · 28ec4dc
2 parents bd1e361 + 401826d
commit 28ec4dc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/rc/emacs-rc-clojure.el b/rc/emacs-rc-clojure.el
@@ -14,13 +14,18 @@
 (add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode))
 ;; TODO: add clojure-test-mode
 
+(autoload 'clojure-test-mode "clojure-test-mode" "Clojure test mode" t)
+(autoload 'clojure-test-maybe-enable "clojure-test-mode" "" t)
+
 (defun alexott/clojure-mode-hook ()
   "Hook for Clojure mode"
   (turn-on-eldoc-mode)
   (paredit-mode 1)
   (local-set-key [return] 'newline-and-indent)
   (set (make-local-variable 'slime-lisp-implementations)
        (list (assoc 'clojure slime-lisp-implementations)))
+  ;; clojure-test-mode
+  (clojure-test-maybe-enable)
   )
 (add-hook 'clojure-mode-hook 'alexott/common-hook)
 (add-hook 'clojure-mode-hook 'alexott/show-prog-keywords)

diff --git a/rc/emacs-rc-common-hooks.el b/rc/emacs-rc-common-hooks.el
@@ -25,8 +25,8 @@
 
 ;; clean trailing whitespaces automatically
 (setq alexott/trailing-whitespace-modes '(c++-mode c-mode haskell-mode emacs-lisp-mode
-                                                   lisp-mode scheme-mode erlang-mode
-                                                   clojure-mode))
+                                                   lisp-mode scheme-mode erlang-mode))
+
 (defun alexott/trailing-whitespace-hook ()
   (when (member major-mode alexott/trailing-whitespace-modes)
     (delete-trailing-whitespace)))

diff --git a/rc/emacs-rc-erc.el b/rc/emacs-rc-erc.el
@@ -14,7 +14,7 @@
 (erc-autojoin-mode t)
 (setq erc-autojoin-channels-alist
       '(
-;;        ("freenode.net" "#couchdb")
+        ("freenode.net" "#clojure")
 ;;        ("freenode.net" "#couchdb" "#haskell")
         ("irc.int.ru" "#unix")
         ("irc.fu-berlin.de" "#unix.ru" "#fidorus")
@@ -57,7 +57,7 @@
   "Connect to IRC."
   (interactive)
   (progn
-    (erc-select :server "irc.int.ru" :port 6667 :nick "alexott")
+;;    (erc-select :server "irc.int.ru" :port 6667 :nick "alexott")
     (erc-select :server "irc.freenode.net" :port 6667 :nick "alexott")
 ;;    (erc-select :server "irc.fu-berlin.de" :port 6667 :nick "alexott")
   ))

diff --git a/rc/emacs-rc-jabber.el b/rc/emacs-rc-jabber.el
@@ -18,8 +18,8 @@
     (message "%s" server)
     (if (string-equal server "gmail.com")
         (progn
-;;          (jabber-groupchat-join jc "devil@conference.jabber.ru" "alexott")
-;;          (jabber-groupchat-join jc "haskell@conference.jabber.ru" "alexott")
+          (jabber-groupchat-join jc "devil@conference.jabber.ru" "alexott")
+          (jabber-groupchat-join jc "haskell@conference.jabber.ru" "alexott")
 ;;          (jabber-groupchat-join jc "lisp@conference.jabber.ru" "alexott")
 ;;          (jabber-groupchat-join jc "emacs@conference.jabber.ru" "alexott")
 ;;          (jabber-groupchat-join jc "icfpc@conference.jabber.ru" "alexott")