mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 19:07:52 +00:00
Code Releases Activity

Merge branch 'develop' of stardiviner/org-mode into master

Browse source
This commit is contained in:
Bastien Guerry 2018-03-06 07:49:47 +00:00 committed by Gogs
parent 881da595dd 49a8de4ffd
commit f7b120e566
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/ob-core.el
View file

@ -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."