custom-before and custom-after instead of just custom.el

This commit is contained in:
Ivan Malison 2015-02-05 15:00:19 -08:00
parent 86a9f2812a
commit d44ee25454

View File

@ -24,6 +24,16 @@
(>= emacs-minor-version 4)) (>= emacs-minor-version 4))
(>= emacs-major-version 25))) (>= emacs-major-version 25)))
;; =============================================================================
;; Load Path Configuration
;; =============================================================================
(defvar machine-custom "~/.emacs.d/this-machine.el")
(setq custom-file "~/.emacs.d/custom-after.el")
(setq custom-early-file "~/.emacs.d/custom-before.el")
(when (file-exists-p custom-early-file) (load custom-early-file))
(when (file-exists-p machine-custom) (load machine-custom))
;; ============================================================================= ;; =============================================================================
;; GUI Disables ;; GUI Disables
;; ============================================================================= ;; =============================================================================
@ -324,15 +334,6 @@ The current directory is assumed to be the project's root otherwise."
(error "You're not in a project") (error "You're not in a project")
default-directory))))) default-directory)))))
;; =============================================================================
;; Load Path Configuration
;; =============================================================================
(defvar machine-custom "~/.emacs.d/this-machine.el")
(setq custom-file "~/.emacs.d/custom.el")
(when (file-exists-p custom-file) (load custom-file))
(when (file-exists-p machine-custom) (load machine-custom))
;; ============================================================================= ;; =============================================================================
;; General Emacs Options ;; General Emacs Options
;; ============================================================================= ;; =============================================================================
@ -1787,11 +1788,13 @@ window is active in the perspective."
(defadvice load-theme (after name activate) (defadvice load-theme (after name activate)
(remove-fringe-and-hl-line-mode))) (remove-fringe-and-hl-line-mode)))
;; enable to set theme based on time of day.
(run-at-time "00:00" 3600 'set-theme)
;; This is needed because you can't set the font at daemon start-up. ;; This is needed because you can't set the font at daemon start-up.
(add-hook 'after-make-frame-functions 'set-my-font-for-frame) (add-hook 'after-make-frame-functions 'set-my-font-for-frame)
(add-hook 'after-make-frame-functions (lambda (frame) (set-theme))) (add-hook 'after-make-frame-functions (lambda (frame) (set-theme)))
(put 'narrow-to-region 'disabled nil) (put 'narrow-to-region 'disabled nil)
(put 'narrow-to-page 'disabled nil) (put 'narrow-to-page 'disabled nil)
(when (file-exists-p custom-file) (load custom-file))
;; enable to set theme based on time of day.
(run-at-time "00:00" 3600 'set-theme)