diff options
author | Bastien Guerry <bzg@gnu.org> | 2018-03-06 07:49:47 +0000 |
---|---|---|
committer | Gogs <gogs@fake.local> | 2018-03-06 07:49:47 +0000 |
commit | f7b120e566fb85f37c300a7ae151eb81b6740eaf (patch) | |
tree | 621c21738e51e9e260b0e0ba05cf278c3c332f0b | |
parent | 881da595dda494ce27b0c4679c2224693eedba7c (diff) | |
parent | 49a8de4ffd2d0fc50c975ff3edac15d2bb37a809 (diff) | |
download | org-mode-f7b120e566fb85f37c300a7ae151eb81b6740eaf.tar.gz |
Merge branch 'develop' of stardiviner/org-mode into master
-rw-r--r-- | lisp/ob-core.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index f84b9f1..b7ffda0 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2500,15 +2500,18 @@ in the buffer." If the `default-directory' is different from the containing file's directory then expand relative links." (when (stringp result) - (format "[[file:%s]%s]" - (if (and default-directory - buffer-file-name - (not (string= (expand-file-name default-directory) - (expand-file-name - (file-name-directory buffer-file-name))))) - (expand-file-name result default-directory) - result) - (if description (concat "[" description "]") "")))) + (let ((same-directory? (not (string= (expand-file-name default-directory) + (expand-file-name + (file-name-directory buffer-file-name)))))) + (format "[[file:%s]%s]" + (if (and default-directory buffer-file-name same-directory?) + (if (eq org-link-file-path-type 'adaptive) + (file-relative-name + (expand-file-name result default-directory) + (file-name-directory (buffer-file-name))) + (expand-file-name result default-directory)) + result) + (if description (concat "[" description "]") ""))))) (defun org-babel-examplify-region (beg end &optional results-switches inline) "Comment out region using the inline `==' or `: ' org example quote." |