diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-09 19:24:53 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-09 19:24:53 -0500 |
| commit | 4bb669b4ff4391687c36af4ac4874d4263f84403 (patch) | |
| tree | 83bf27ef4438dcef5a49098af35c7fc9f4bd34d3 | |
| parent | 0405dd076911be05c1c04fb14f5575f80d8fb637 (diff) | |
| parent | 865a768e44624c465e9d42c6ca91d0ef29a8e7ad (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
Conflicts:
.config/emacs/init.el
| -rw-r--r-- | .config/emacs/init.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 35d57bb..ee77250 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -1,5 +1,5 @@ ;; This config requires Emacs 24.4(+?) -;; Without (add-advice) it should work in older versions of Emacs 24. +;; Without (advice-add) it should work in older versions of Emacs 24. ;;;; Use XDG-ish locations ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (setq xdg-cache-home (file-name-as-directory (or (getenv "XDG_CACHE_HOME") "~/.cache"))) (setq @@ -131,6 +131,8 @@ ;; Misc. crap (when (fboundp 'tool-bar-mode) (tool-bar-mode -1)) +(setq inhibit-startup-screen t) +(setq-default truncate-lines t) (defun align-regexp--use-spaces (orig-fun &rest args) "Use spaces for alignment" |