From 3c8e868b1b2631dbff34aca019a05d1cca279f8e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 8 Aug 2019 10:10:11 -0400 Subject: [PATCH] Remove built-in org from load-path at install time Makes it less likely that packages will load the original org before the new one has been installed. --- modules/lang/org/packages.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index a71a67bf7..b085c68b7 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -1,6 +1,12 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/org/packages.el +;; Prevent built-in Org from playing into the byte-compilation of +;; `org-plus-contrib'. +(when-let (orglib (locate-library "org" nil doom--initial-load-path)) + (setq load-path (delete (substring (file-name-directory orglib) 0 -1) + load-path))) + (package! org-plus-contrib) ; install cutting-edge version of org-mode (package! org-bullets :recipe (:host github :repo "Kaligule/org-bullets")) (package! toc-org)