From 6457d54ec74f54b331039ccb2949ba13dbe87706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Sun, 3 Mar 2019 19:46:51 -0500 Subject: [PATCH] Do not hard-code ~/emacs.d Instead, use user-emacs-directory --- init.el | 2 +- modules/init-editing-utils.el | 2 +- modules/init-modeline.el | 2 +- modules/init-utils.el | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/init.el b/init.el index ebdf1fa..834472f 100644 --- a/init.el +++ b/init.el @@ -10,7 +10,7 @@ (error "This is made form Emacs >=24")) (defconst emacs-start-time (current-time)) -(add-to-list 'load-path (expand-file-name "~/.emacs.d/modules/" user-emacs-directory)) +(add-to-list 'load-path (concat user-emacs-directory "modules")) ;;; Raise garbage collection threshold after init (add-hook 'after-init-hook diff --git a/modules/init-editing-utils.el b/modules/init-editing-utils.el index 35e34d1..be6d047 100644 --- a/modules/init-editing-utils.el +++ b/modules/init-editing-utils.el @@ -76,7 +76,7 @@ (global-undo-tree-mode 1)) ;;---------------------------------------------------------------------------- -(load-file "~/.emacs.d/modules/lib/myemacs.el") +(load-file (concat user-emacs-directory "/modules/lib/myemacs.el")) (provide 'init-editing-utils) diff --git a/modules/init-modeline.el b/modules/init-modeline.el index 4444a09..5f69d87 100644 --- a/modules/init-modeline.el +++ b/modules/init-modeline.el @@ -47,7 +47,7 @@ (global-set-key (kbd "M-%") 'anzu-query-replace) (global-set-key (kbd "s-") 'anzu-query-replace)) -(load-file "~/.emacs.d/modules/lib/myemacs.el") +(load-file (concat user-emacs-directory "/modules/lib/myemacs.el")) (provide 'init-modeline) ;; End: diff --git a/modules/init-utils.el b/modules/init-utils.el index ffcdd9f..e2cb42e 100644 --- a/modules/init-utils.el +++ b/modules/init-utils.el @@ -13,7 +13,7 @@ read the .el files" (mapc load-it (directory-files dir nil "\\.el$")))) ;; Load lib functions -(load-directory (expand-file-name "~/.emacs.d/modules/lib/" user-emacs-directory)) +(load-directory (concat user-emacs-directory "/modules/lib/")) ;; This is borrowed from https://github.com/purcell/emacs.d/blob/master/lisp/init-utils.el by Steve Purcell but I have added some stuff. (if (fboundp 'with-eval-after-load) @@ -25,7 +25,7 @@ read the .el files" '(progn ,@body)))) ;; Elapsed time -(load-file "~/.emacs.d/modules/lib/myemacs.el") +(load-file (concat user-emacs-directory "/modules/lib/myemacs.el")) (provide 'init-utils) ;;; init-utils.el ends here