Permalink
Browse files

Merge branch 'master' of github.com:edgecase/emacs-config

  • Loading branch information...
2 parents 12a66b9 + db2dc7e commit bb3e8188b5e4fc6bac61e7152e0ea769cb316c21 @bostonaholic bostonaholic committed Sep 20, 2012
Showing with 20 additions and 5 deletions.
  1. +4 −4 .emacs.d/config-cosmetics.el
  2. +1 −0 .emacs.d/config-hooks.el
  3. +14 −1 .emacs.d/init.el
  4. +1 −0 .gitignore
@@ -11,13 +11,13 @@
;; turn on line numbers
(global-linum-mode t)
-;; highlight ending whitespace
-(global-whitespace-mode t)
-
;; display only tails of lines longer than 80 columns, tabs and
;; trailing whitespaces
(setq whitespace-line-column 80
- whitespace-style '(face tabs trailing lines-tail))
+ whitespace-style '(face trailing tabs lines-tail empty))
+
+;; highlight ending whitespace
+(global-whitespace-mode t)
;; default tab-width
(setq-default tab-width 2)
View
@@ -18,3 +18,4 @@
(add-hook 'emacs-lisp-mode-hook 'my-emacs-lisp-mode-hook)
(add-hook 'kill-emacs-hook 'byte-compile-user-init-file t t)
+;;(add-hook 'after-save-hook 'delete-trailing-whitespace)
View
@@ -39,7 +39,7 @@
magit
markdown-mode
marmalade
- ;; midje-mode
+ nrepl
oddmuse
window-number
yasnippet
@@ -95,3 +95,16 @@
(load "config-sh-mode")
(load "config-window-number-mode")
(load "config-yaml-mode")
+
+;; Put auto-save files (ie #foo#) and backup files (ie foo~) in ~/.emacs.d/auto-save-files.
+;; (custom-set-variables
+;; '(auto-save-file-name-transforms '((".*" "~/.emacs.d/auto-save-files/\\1" t)))
+;; '(backup-directory-alist '((".*" . "~/.emacs.d/backups/"))))
+
+(setq backup-directory-alist
+ `((".*" . , "~/.emacs.d/backups/")))
+(setq auto-save-file-name-transforms
+ `((".*" , "~/.emacs.d/auto-save-files/" t)))
+
+;; create the autosave dir if necessary, since emacs won't.
+(make-directory "~/.emacs.d/auto-save-files/" t)
View
@@ -5,6 +5,7 @@
.emacs.d/ac-dict
.emacs.d/auto-complete*
.emacs.d/auto-save-list
+.emacs.d/auto-save-files
.emacs.d/backups
.emacs.d/elpa
.emacs.d/eshell

0 comments on commit bb3e818

Please sign in to comment.