diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-09 22:51:14 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-09 22:51:14 -0500 |
commit | 66c5faa2bce8809a1e7e90eec0542b4de07915df (patch) | |
tree | 36744580a3081f482fe0ee28428f24f664ec5202 /.config/emacs | |
parent | f9232bbdeeb4000d7b89b8a59d591b787266c24b (diff) | |
parent | ca3e04971996ebe2eebf88775e96bbf547aa0abe (diff) |
Merge remote-tracking branch 'origin/master' into build64-par/master
Diffstat (limited to '.config/emacs')
-rw-r--r-- | .config/emacs/init.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index f570a1a..5429c08 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -77,7 +77,9 @@ ;; This is also nice because I can do event-base programming for what ;; to do once a package is loaded, using :after. -(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/")) +;; For some reason, el-get adds a bunch of 3rd-party repos to +;; package-archives. I guess I'm ok with that? I don't have to +;; manage them. (setq package-enable-at-startup nil) ;; What packages el-get should get from ELPA (if it gets them at all) @@ -86,11 +88,8 @@ (:name dtrt-indent :type elpa ;; Detect indent style for existing files :after (dtrt-indent-mode 1)) (:name page-break-lines :type elpa ;; Display form-feeds pretty - :after (progn - (define-global-minor-mode global-page-break-lines-mode - page-break-lines-mode page-break-lines-mode - :group 'page-break-lines) - (global-page-break-lines-mode 1))) + :before (advice-add 'page-break-lines-mode-maybe :override #'page-break-lines-mode) + :after (global-page-break-lines-mode 1)) (:name smart-tabs-mode :type elpa ;; Indent with tabs, align with spaces :after (progn (smart-tabs-mode 1) |