diff options
| -rw-r--r-- | config.org | 9 | ||||
| -rw-r--r-- | init.el | 8 |
2 files changed, 10 insertions, 7 deletions
| diff --git a/config.org b/config.org index 082032d..e939a4c 100644 --- a/config.org +++ b/config.org | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #+EXPORT_FILE_NAME: README.md | 5 | #+EXPORT_FILE_NAME: README.md |
| 6 | #+OPTIONS: toc:nil | 6 | #+OPTIONS: toc:nil |
| 7 | #+BANKRUPTCY_COUNT: 3.2 | 7 | #+BANKRUPTCY_COUNT: 3.2 |
| 8 | #+Time-stamp: <2021-01-09 14:40:57 acdw> | 8 | #+Time-stamp: <2021-01-09 14:44:35 acdw> |
| 9 | 9 | ||
| 10 | * Basics | 10 | * Basics |
| 11 | 11 | ||
| @@ -1946,9 +1946,10 @@ I’m only enabling this at home for now, since it requires building stuff. | |||
| 1946 | (conf-org (concat conf ".org"))) | 1946 | (conf-org (concat conf ".org"))) |
| 1947 | (unless (and (file-newer-than-file-p conf-el conf-org) | 1947 | (unless (and (file-newer-than-file-p conf-el conf-org) |
| 1948 | (load conf 'no-error)) | 1948 | (load conf 'no-error)) |
| 1949 | ;; A plain require here just loads the older `org' in Emacs' install dir. We | 1949 | ;; A plain require here just loads the older `org' |
| 1950 | ;; need to add the newer one to the `load-path', hopefully that's all. | 1950 | ;; in Emacs' install dir. We need to add the newer |
| 1951 | (add-to-list 'load-path (expand-file-name "straight/build/org/" | 1951 | ;; one to the `load-path', hopefully that's all. |
| 1952 | (add-to-list 'load-path (expand-file-name "straight/build/org" | ||
| 1952 | user-emacs-directory)) | 1953 | user-emacs-directory)) |
| 1953 | (require 'org) | 1954 | (require 'org) |
| 1954 | (org-babel-load-file conf-org))) | 1955 | (org-babel-load-file conf-org))) |
| diff --git a/init.el b/init.el index eb25e2e..e8b999d 100644 --- a/init.el +++ b/init.el | |||
| @@ -12,8 +12,10 @@ | |||
| 12 | (conf-org (concat conf ".org"))) | 12 | (conf-org (concat conf ".org"))) |
| 13 | (unless (and (file-newer-than-file-p conf-el conf-org) | 13 | (unless (and (file-newer-than-file-p conf-el conf-org) |
| 14 | (load conf 'no-error)) | 14 | (load conf 'no-error)) |
| 15 | ;; A plain require here just loads the older `org' in Emacs' install dir. We | 15 | ;; A plain require here just loads the older `org' |
| 16 | ;; need to add the newer one to the `load-path', hopefully that's all. | 16 | ;; in Emacs' install dir. We need to add the newer |
| 17 | (add-to-list 'load-path (expand-file-name "straight/build/org/")) | 17 | ;; one to the `load-path', hopefully that's all. |
| 18 | (add-to-list 'load-path (expand-file-name "straight/build/org" | ||
| 19 | user-emacs-directory)) | ||
| 18 | (require 'org) | 20 | (require 'org) |
| 19 | (org-babel-load-file conf-org))) | 21 | (org-babel-load-file conf-org))) |