From 879ab3b2f38ed2deefe2c1bab807cc4d20d5b848 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 22 Jul 2019 04:20:52 +0200 Subject: [PATCH] Replace incorrect usage of doom-dir with doom-path --- core/cli/install.el | 4 ++-- modules/lang/org/config.el | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/cli/install.el b/core/cli/install.el index 9a1f63ef0..885cad150 100644 --- a/core/cli/install.el +++ b/core/cli/install.el @@ -32,7 +32,7 @@ install understands the following switches: --no-env Don't generate an envvars file (see `doom help env`) --no-fonts Don't install (or prompt to install) all-the-icons fonts" (print! (green "Installing Doom Emacs!\n")) - (let ((default-directory (doom-dir "~"))) + (let ((default-directory (doom-path "~"))) ;; Create `doom-private-dir' (if (member "--no-config" args) (print! (warn "Not copying private config template, as requested")) @@ -51,7 +51,7 @@ install understands the following switches: (print! (success "Done!"))))) '(("init.el" . (lambda () - (insert-file-contents (doom-dir "init.example.el")))) + (insert-file-contents (doom-path "init.example.el")))) ("config.el" . (lambda () (insert! ";;; %sconfig.el -*- lexical-binding: t; -*-\n\n" diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 6e80d2573..cadc250fb 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -272,7 +272,7 @@ Some commands of interest: + `+org-attach/file' + `+org-attach/url' + `+org-attach/sync'" - (setq org-attach-directory (doom-dir org-directory org-attach-directory)) + (setq org-attach-directory (doom-path org-directory org-attach-directory)) ;; A shorter link to attachments (add-to-list 'org-link-abbrev-alist