emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Load core-lib & refactor x-win advice

Browse source
This commit is contained in:
Henrik Lissner 2019-10-18 22:07:48 -04:00
parent 3388fa028d
commit 2f4ac32b0d
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/core.el
View file

@ -7,6 +7,9 @@
;; Ensure `doom-core-dir' is in `load-path' ;; Ensure `doom-core-dir' is in `load-path'
(add-to-list 'load-path (file-name-directory load-file-name)) (add-to-list 'load-path (file-name-directory load-file-name))
;; Load the bare necessities
(require 'core-lib)
;; ;;
;;; Global variables ;;; Global variables
@ -204,13 +207,11 @@ users).")
url-cache-directory (concat doom-cache-dir "url/") url-cache-directory (concat doom-cache-dir "url/")
url-configuration-directory (concat doom-etc-dir "url/") url-configuration-directory (concat doom-etc-dir "url/")
gamegrid-user-score-file-directory (concat doom-etc-dir "games/")) gamegrid-user-score-file-directory (concat doom-etc-dir "games/"))
;; HACK
(with-eval-after-load 'x-win ;; HACK Stop sessions from littering the user directory
(defun emacs-session-filename (session-id) (defadvice! doom--use-cache-dir-a (session-id)
"Construct a filename to save a session based on SESSION-ID. :override #'emacs-session-filename
Doom Emacs overrides this function to stop sessions from littering the user (concat doom-cache-dir "emacs-session." session-id))
directory. The session files are placed by default in `doom-cache-dir'"
(concat doom-cache-dir "emacs-session." session-id)))
;; ;;
@ -490,15 +491,13 @@ to least)."
load-path doom--initial-load-path load-path doom--initial-load-path
process-environment doom--initial-process-environment) process-environment doom--initial-process-environment)
(require 'core-lib)
(require 'core-modules)
;; Load shell environment, optionally generated from 'doom env' ;; Load shell environment, optionally generated from 'doom env'
(when (and (or (display-graphic-p) (when (and (or (display-graphic-p)
(daemonp)) (daemonp))
(file-exists-p doom-env-file)) (file-exists-p doom-env-file))
(doom-load-envvars-file doom-env-file)) (doom-load-envvars-file doom-env-file))
(require 'core-modules)
(let (;; `doom-autoload-file' tells Emacs where to load all its functions (let (;; `doom-autoload-file' tells Emacs where to load all its functions
;; from. This includes everything in core/autoload/*.el and autoload ;; from. This includes everything in core/autoload/*.el and autoload
;; files in enabled modules. ;; files in enabled modules.