emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/org: resolve +org-dir later

Browse source 
Gives users more of a chance to change +org-dir before paths are
resolved with it.

Addresses #296
This commit is contained in:
Henrik Lissner 2017-12-24 15:13:36 -05:00
parent 208fbb1726
commit b0c73c486e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/lang/org/+attach.el
View file

@ -15,7 +15,7 @@
;; + `+org-attach/url' ;; + `+org-attach/url'
;; + :org [FILE/URL] ;; + :org [FILE/URL]
(defvar +org-attach-dir (expand-file-name ".attach/" +org-dir) (defvar +org-attach-dir ".attach/"
"Where to store attachments (relative to current org file).") "Where to store attachments (relative to current org file).")
@ -30,7 +30,7 @@
(advice-add #'org-download-enable :override #'ignore) (advice-add #'org-download-enable :override #'ignore)
:config :config
(setq-default org-download-image-dir +org-attach-dir (setq-default org-download-image-dir org-attach-directory
org-download-heading-lvl nil org-download-heading-lvl nil
org-download-timestamp "_%Y%m%d_%H%M%S") org-download-timestamp "_%Y%m%d_%H%M%S")
@ -61,12 +61,12 @@
;; ;;
(after! org (after! org
(setq org-attach-directory +org-attach-dir) (setq org-attach-directory (expand-file-name +org-attach-dir +org-dir))
(push (car (last (split-string +org-attach-dir "/" t))) (push (car (last (split-string +org-attach-dir "/" t)))
projectile-globally-ignored-directories) projectile-globally-ignored-directories)
(after! recentf (after! recentf
(push (format "%s.+$" (regexp-quote +org-attach-dir)) (push (format "%s.+$" (regexp-quote org-attach-directory))
recentf-exclude))) recentf-exclude)))

6
modules/lang/org/autoload/org-attach.el
View file

@ -98,7 +98,7 @@ the cursor."
(delete-region (match-beginning 0) (match-end 0)) (delete-region (match-beginning 0) (match-end 0))
(newline)) (newline))
(cond ((image-type-from-file-name filename) (cond ((image-type-from-file-name filename)
(when (file-in-directory-p filename +org-attach-dir) (when (file-in-directory-p filename org-attach-directory)
(setq filename (file-relative-name filename +org-dir))) (setq filename (file-relative-name filename +org-dir)))
(insert (insert
(concat (if (= org-download-image-html-width 0) (concat (if (= org-download-image-html-width 0)
@ -124,9 +124,7 @@ the cursor."
(let* ((context (save-match-data (org-element-context))) (let* ((context (save-match-data (org-element-context)))
(file (org-link-unescape (org-element-property :path context))) (file (org-link-unescape (org-element-property :path context)))
(default-directory (default-directory
(if (string-prefix-p (if (file-in-directory-p file org-attach-directory)
(concat "./" (car (last (split-string +org-attach-dir "/" t))))
file)
+org-dir +org-dir
default-directory))) default-directory)))
(apply orig-fn args)) (apply orig-fn args))