This commit is contained in:
John Doty 2014-06-03 07:22:34 -07:00
parent 9aa1adc8f6
commit 0225d656f3
2 changed files with 35 additions and 9 deletions

View file

@ -88,7 +88,16 @@
'tss ; Typescript, ala https://github.com/aki2o/emacs-tss '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?) 'auto-complete-nxml ; Auto-complete for nxml (maybe?)
'magit ; Magit? 'magit ; Magit?
) )
@ -141,7 +150,7 @@
(if (fboundp 'tool-bar-mode) (tool-bar-mode -1)) (if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
(if (fboundp 'menu-bar-mode) (menu-bar-mode -1)) (if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
;; Consolas. ;; Consolas. (And, to a lesser extent, Inconsolata.)
;; ;;
(require 'cl) (require 'cl)
(defun font-existsp (font) (defun font-existsp (font)
@ -364,7 +373,8 @@
(defun indent-buffer () (defun indent-buffer ()
"Indent the entire current buffer based on the current mode" "Indent the entire current buffer based on the current mode"
(interactive) (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) (global-set-key (read-kbd-macro "C-c TAB") 'indent-buffer)
@ -561,11 +571,11 @@
(require 'go-mode) (require 'go-mode)
(require 'auto-complete-config) (require 'auto-complete-config)
;(require 'go-autocomplete) (require 'go-autocomplete)
(defun my-go-mode-hook () (defun my-go-mode-hook ()
(flycheck-mode) (flycheck-mode)
;(auto-complete-mode) (auto-complete-mode)
) )
(add-hook 'go-mode-hook 'my-go-mode-hook) (add-hook 'go-mode-hook 'my-go-mode-hook)
@ -595,3 +605,18 @@
;; ================================================================= ;; =================================================================
(add-to-list 'auto-mode-alist '("\\.appx\\'" . archive-mode)) (add-to-list 'auto-mode-alist '("\\.appx\\'" . archive-mode))
(add-to-list 'auto-coding-alist '("\\.appx\\'" . no-conversion)) (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)

View file

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