updating from mome, moving to new clojure-jack-in

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "packages/clojure-mode"]
 	path = packages/clojure-mode
 	url = git://github.com/jochu/clojure-mode.git
+	url = git://github.com/jochu/clojure-mode.git
 [submodule "packages/swank-clojure"]
 	path = packages/swank-clojure
 	url = git://github.com/jochu/swank-clojure.git

init.el

@@ -1,5 +1,15 @@
 (setq *EMACS-ENV* "~/.emacs.d")
 
+(defun set-exec-path-from-shell-PATH ()
+  (let ((path-from-shell (replace-regexp-in-string
+                          "[ \t\n]*$"
+                          ""
+                          (shell-command-to-string "$SHELL --login -i -c 'echo $PATH'"))))
+    (setenv "PATH" path-from-shell)
+    (setq exec-path (split-string path-from-shell path-separator))))
+
+(if window-system (set-exec-path-from-shell-PATH))
+
 (require 'dired)
 
 ;;; This was installed by package-install.el.
@@ -18,7 +28,7 @@
 (add-to-list 'load-path (concat *EMACS-ENV* "/packages"))
 (add-to-list 'load-path (concat *EMACS-ENV* "/packages/clojure-mode"))
 ;(add-to-list 'load-path (concat *EMACS-ENV* "/packages/swank-clojure"))
-(add-to-list 'load-path (concat *EMACS-ENV* "/packages/slime"))
+;(add-to-list 'load-path (concat *EMACS-ENV* "/packages/slime"))
 
 (load-file (concat *EMACS-ENV* "/init/init_clojure.el"))
 (load-file (concat *EMACS-ENV* "/init/init_ruby.el"))

init/init_clojure.el

@@ -1,20 +1,18 @@
-(require 'clojure-mode)
-
 ;; clojure-mode
 (require 'clojure-mode)
 
 ;; swank-clojure
-(add-to-list 'load-path (concat *FURTIVE-ROOT* "/lib/clojure/swank-clojure/src"))
+;(add-to-list 'load-path (concat *FURTIVE-ROOT* "/lib/clojure/swank-clojure/src"))
 
-(setq swank-clojure-jar-path (concat *FURTIVE-ROOT* "/lib/java/clojure-1.2.0.jar"))
-(setq swank-clojure-classpath (list
-                               (concat *FURTIVE-ROOT* "/lib/clojure/swank-clojure/src/")
-                               (concat *FURTIVE-ROOT* "/lib/java/*")))
-(load-file (concat *EMACS-ENV* "/custom/swank_paths.el")) ;;do this after the setq call above
+;(setq swank-clojure-jar-path (concat *FURTIVE-ROOT* "/lib/java/clojure-1.2.0.jar"))
+;(setq swank-clojure-classpath (list
+;                               (concat *FURTIVE-ROOT* "/lib/clojure/swank-clojure/src/")
+;                               (concat *FURTIVE-ROOT* "/lib/java/*")))
+;(load-file (concat *EMACS-ENV* "/custom/swank_paths.el")) ;;do this after the setq call above
 
-(setq swank-clojure-jar-home (concat *FURTIVE-ROOT* "/lib/clojure/swank-clojure/lib/"))
+;(setq swank-clojure-jar-home (concat *FURTIVE-ROOT* "/lib/clojure/swank-clojure/lib/"))
 
-(require 'swank-clojure)
+;(require 'swank-clojure)
 
 ;;; paredit
 (require 'paredit)
@@ -26,10 +24,10 @@
 (add-hook 'clojure-mode-hook             (lambda () (paredit-mode +1)))
 
 ;; slime
-(eval-after-load "slime"
-  '(progn (slime-setup '(slime-repl))))
+;; (eval-after-load "slime"
+;;   '(progn (slime-setup '(slime-repl))))
 
-(require 'slime)
-(slime-setup)
+;; (require 'slime)
+;; (slime-setup)
 
 ;(add-to-list 'slime-lisp-implementations '(sbcl ("sbcl")))