awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-29 14:33:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Mark +org-dir obsolete (use org-directory instead)

Browse Source 
I prefer not to invent new variables when they aren't strictly
necessary. org-directory is one such variable (although the other path
variables are still necessary).
This commit is contained in:
Henrik Lissner
2018-06-15 00:45:26 +02:00
parent db8b4091dd
commit 6693db48af
8 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/lang/org/+attach.el
View File

@@ -6,9 +6,9 @@
;; files with metadata I don't want. So I wrote my own, which:
;;
;; + Places attachments in a centralized location (`+org-attach-dir' in
;; `+org-dir'), using an attach:* link abbreviation.
;; + Use `+org-attach/sync' to index all attachments in `+org-dir' that use the
;; attach:* abbreviation and delete orphaned ones that are no longer
;; `org-directory'), using an attach:* link abbreviation.
;; + Use `+org-attach/sync' to index all attachments in `org-directory' that use
;; the attach:* abbreviation and delete orphaned ones that are no longer
;; referenced.
;; + Adds drag-and-drop support for images (with inline image preview)
;; + Adds drag-and-drop support for media files (pdfs, zips, etc) with a
@@ -21,7 +21,7 @@
;; + `+org-attach/sync'
(defvar +org-attach-dir ".attach/"
"Where to store attachments relative to `+org-dir'.")
"Where to store attachments relative to `org-directory'.")
;;
@@ -55,14 +55,14 @@
(advice-add #'org-download-insert-link :override #'+org-attach*insert-link)
(defun +org-attach*download-subdir ()
(when (file-in-directory-p buffer-file-name +org-dir)
(file-relative-name buffer-file-name +org-dir)))
(when (file-in-directory-p buffer-file-name org-directory)
(file-relative-name buffer-file-name org-directory)))
(defun +org-attach*download-fullname (path)
"Write PATH relative to current file."
(let ((dir (or (if buffer-file-name (file-name-directory buffer-file-name))
default-directory)))
(if (file-in-directory-p dir +org-dir)
(if (file-in-directory-p dir org-directory)
(file-relative-name path dir)
path)))
(advice-add #'org-download--dir-2 :override #'ignore)
@@ -75,7 +75,7 @@
;;
(defun +org|init-attach ()
(setq org-attach-directory (expand-file-name +org-attach-dir +org-dir))
(setq org-attach-directory (expand-file-name +org-attach-dir org-directory))
;; A shorter link to attachments
(push (cons "attach" (abbreviate-file-name org-attach-directory)) org-link-abbrev-alist)