Convert to tabs, add :retab, more file associations

This commit is contained in:
Henrik Lissner 2014-07-17 05:53:01 -04:00
parent 9b83095211
commit 639a5ff9bd
4 changed files with 29 additions and 24 deletions

View file

@ -66,6 +66,9 @@
(associate-mode 'org-mode '(".org" ".gtd") t)
(associate-mode 'js2-mode '(".js" ".json"))
(associate-mode 'web-mode '(".html" ".htm" ".phtml" ".tpl" ".tpl.php" ".erb"))
; (associate-mode 'lua-mode ".lua")
;; (associate-mode 'yaml-mode ".yml")
;; (associate-mode 'python-mode ".py")
(associate-mode 'lua-mode '(".lua"))
(associate-mode 'yaml-mode '(".yml"))
(associate-mode 'python-mode '(".py"))
(associate-mode 'c++-mode '(".h") t)
;;

View file

@ -15,7 +15,7 @@
yasnippet ; snippets: expand with tab
rainbow-delimiters ; colored matching parenthesis
rainbow-mode ; highlight color codes
highlight-indentation ; visual indentation guides
;; highlight-indentation ; visual indentation guides
saveplace ; restore cursor position on buffer load
volatile-highlights ; temporarily highlight changes on undo/yank
anzu ; display current + total matches searching
@ -34,8 +34,8 @@
(setq blink-matching-paren nil) ; disable blink-matching-paren
(setq-default
tab-width 4 ; set tab width to 4 for all buffers
indent-tabs-mode nil ; always replace tabs with spaces
tab-always-indent nil)
indent-tabs-mode t ; always replace tabs with spaces
tab-always-indent t)
;; do not soft-wrap lines
(setq-default truncate-lines t)
@ -43,7 +43,7 @@
;; Prettify code-related major modes
(add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
(add-hook 'prog-mode-hook #'highlight-indentation-mode)
;; (add-hook 'prog-mode-hook #'highlight-indentation-mode)
;; Remove trailing whitespace
(add-hook 'before-save-hook 'delete-trailing-whitespace)

View file

@ -175,6 +175,7 @@
;; (cmap "e[dit]" 'find-file)
;; (cmap "n[ew]" ')
(cmap "retab" 'indent-region)
;;;; Keymap fixes ;;;;;;;;;;;;;;;

View file

@ -15,8 +15,9 @@
(diminish 'volatile-highlights-mode)
(diminish 'undo-tree-mode)
(diminish 'auto-complete-mode)
(diminish 'highlight-indentation-mode)
(diminish 'flyspell-mode " ?")
(diminish 'projectile-mode)
(diminish 'yas-minor-mode)
))
;; Sane scroll settings