diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:52:42 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:52:42 -0500 |
| commit | 739fa0ff2b7b0581b2d294f8de8b9e79234ed66c (patch) | |
| tree | 654bda35871bf30bdedc7b8e252c474f2c0f143e /.config/emacs/init.el | |
| parent | 7a2dd3a7e3f465141c90abedcb814f9ee9712edd (diff) | |
Fix merge issues
Diffstat (limited to '.config/emacs/init.el')
| -rw-r--r-- | .config/emacs/init.el | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index c2c5604..f8f19e0 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -41,7 +41,6 @@ ;;;; Early settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; This isn't particularly important, but set it before doing a whole ;; lot (loading packages), so there isn't a weird change in text size. -(setq notify-method 'notify-via-libnotify) (set-face-attribute 'default nil :height 80) @@ -216,9 +215,6 @@ sh-script.el is broken." ediff-split-window-function 'split-window-horizontally ) -(set-default 'truncate-lines t) -(setq inhibit-startup-screen t) - ;; Automatically load smerge mode for merge files (defun try-smerge-mode () (save-excursion |