Merge branch 'master' of github.com:DeCarabas/Init-Files

.emacs.d/core.el

@@ -65,9 +65,9 @@
 
 (defvar my-packages
   (list 
-   'switch-window	    ; takes over C-x o
-   'auto-complete	    ; complete as you type with overlays
-   'zencoding-mode  	    ; http://www.emacswiki.org/emacs/ZenCoding
+   'switch-window	         ; takes over C-x o
+   'auto-complete	         ; complete as you type with overlays
+   'zencoding-mode  	     ; http://www.emacswiki.org/emacs/ZenCoding
    'ruby-mode                ; Major mode for editing Ruby files
    'color-theme              ; Color themes...
    'color-theme-solarized    ; ...Solarized
@@ -88,7 +88,16 @@
 
    'tss                      ; Typescript, ala https://github.com/aki2o/emacs-tss
 
-   ;; ----- PROVISIONAL (for whatever that's worth)
+   ;; Clojure stuffs
+   'clojure-mode            
+   'clojure-test-mode
+   'cider
+   'cider-decompile
+   'cider-tracing
+   'ac-nrepl                 ; Autocomplete for Clojure
+
+   'paredit                  ; Also good for lisps?
+
    'auto-complete-nxml       ; Auto-complete for nxml (maybe?)
    'magit                    ; Magit?
    )
@@ -141,7 +150,7 @@
 (if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
 (if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
 
-;; Consolas.
+;; Consolas. (And, to a lesser extent, Inconsolata.)
 ;;
 (require 'cl)
 (defun font-existsp (font)
@@ -206,6 +215,18 @@
 
 (global-set-key (read-kbd-macro "C-x f") 'font-lock-fontify-buffer)
 
+;; In addition, make sure various things are working properly with xterm-keys
+;; on under tmux. (This has been the most reliable way to get putty to send
+;; the right keystrokes into emacs.)
+(defadvice terminal-init-screen
+  ;; The advice is named `tmux', and is run before `terminal-init-screen' runs.
+  (before tmux activate)
+  "Apply xterm keymap, allowing use of keys passed through tmux."
+  (if (getenv "TMUX")
+    (let ((map (copy-keymap xterm-function-map)))
+    (set-keymap-parent map (keymap-parent input-decode-map))
+    (set-keymap-parent input-decode-map map))))
+
 ;; =================================================================
 ;; Random Goo.
 ;; Drunken men who don't know where they are, and no longer care.
@@ -364,7 +385,8 @@
 (defun indent-buffer ()
   "Indent the entire current buffer based on the current mode"
   (interactive)
-  (indent-region (point-min) (point-max) nil))
+  (indent-region (point-min) (point-max))
+  (whitespace-cleanup))
 
 (global-set-key (read-kbd-macro "C-c TAB") 'indent-buffer)
 
@@ -582,11 +604,11 @@
 
 (require 'go-mode)
 (require 'auto-complete-config)
-;(require 'go-autocomplete)
+(require 'go-autocomplete)
 
 (defun my-go-mode-hook ()
   (flycheck-mode)
-  ;(auto-complete-mode)
+  (auto-complete-mode)
   )
 
 (add-hook 'go-mode-hook 'my-go-mode-hook)
@@ -616,3 +638,18 @@
 ;; =================================================================
 (add-to-list 'auto-mode-alist '("\\.appx\\'" . archive-mode))
 (add-to-list 'auto-coding-alist '("\\.appx\\'" . no-conversion))
+
+;; ===
+;; Clojure
+;; ===
+(require 'ac-nrepl)
+(defun my-cider-mode-hook ()
+  ; (paredit-mode)
+  (ac-nrepl-setup)
+  (auto-complete-mode)
+  (cider-turn-on-eldoc-mode)
+  )
+
+(add-hook 'cider-repl-mode-hook 'my-cider-mode-hook)
+(add-hook 'cider-mode-hook 'my-cider-mode-hook)
+(add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)

.emacs.d/custom.el

@@ -8,6 +8,7 @@
  '(c-indent-level 4)
  '(c-label-minimum-indentation 0)
  '(c-label-offset -4)
+ '(css-indent-offset 2)
  '(fast-lock-cache-directories (quote ("~/flc-cache")))
  '(fast-lock-minimum-size nil)
  '(fill-column 77)
@@ -22,7 +23,7 @@
  '(indent-tabs-mode nil)
  '(inhibit-startup-screen t)
  '(ispell-program-name "aspell")
- '(js2-basic-offset 4)
+ '(js2-basic-offset 2)
  '(js2-bounce-indent-p t)
  '(js2-strict-trailing-comma-warning nil)
  '(make-backup-files nil)