From 01f75be6b33263d499fb3881201c4a7aa74cfb67 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 25 Mar 2022 06:46:33 -0700 Subject: settings: simplify server / exec-path-from-shell --- emacs/custom/my-settings.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'emacs/custom') diff --git a/emacs/custom/my-settings.el b/emacs/custom/my-settings.el index a733004..534e564 100644 --- a/emacs/custom/my-settings.el +++ b/emacs/custom/my-settings.el @@ -51,15 +51,15 @@ :config (midnight-mode t)) -(use-package server - :hook (after-init . server-start)) +(unless (and (fboundp 'server-running-p) + (server-running-p)) + (server-start)) (use-package exec-path-from-shell - :ensure t - :config - (progn - (when (memq window-system '(mac ns)) - (exec-path-from-shell-initialize)))) + :if (memq window-system '(mac ns)) + :hook (emacs-startup . (lambda () + (setq exec-path-from-shell-arguments '("-l")) ; removed the -i for faster startup + (exec-path-from-shell-initialize)))) (provide 'my-settings) ;;; my-settings.el ends here -- cgit 1.4.1