>From da491e12fcbf75d9b016f58fbcdeb74d601a1b91 Mon Sep 17 00:00:00 2001 From: stardiviner Date: Wed, 24 Oct 2018 10:45:40 +0800 Subject: [PATCH] org.el: fix org-coderef does not support adaptive file path link type. * org-src.el (org-src-source-file): Add a variable to get the file path at the beginning of the function `org-src--edit-element'. * org.el (org-insert-link): support option org-link-file-path-type 'adaptive value. --- lisp/org-src.el | 9 ++++++++- lisp/org.el | 9 ++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/org-src.el b/lisp/org-src.el index 42e1225ed..0426ff96a 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -277,6 +277,11 @@ issued in the language major mode buffer." "Type of element being edited, as a symbol.") (put 'org-src--source-type 'permanent-local t) +(defvar org-src--source-file nil + "A variable used to store the source file path before entering + source block dedicated buffer.") +(put 'org-src--source-file 'permanent-local t) + (defvar-local org-src--tab-width nil "Contains `tab-width' value from Org source buffer. However, if `indent-tabs-mode' is nil in that buffer, its value @@ -995,7 +1000,9 @@ name of the sub-editing buffer." (let* ((lang (if (eq type 'src-block) (org-element-property :language element) "example")) - (lang-f (and (eq type 'src-block) (org-src--get-lang-mode lang))) + (lang-f (progn + (setq-local org-src--source-file (buffer-file-name)) + (and (eq type 'src-block) (org-src--get-lang-mode lang)))) (babel-info (and (eq type 'src-block) (org-babel-get-src-block-info 'light))) deactivate-mark) diff --git a/lisp/org.el b/lisp/org.el index 0b5e8d739..ab86345bf 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9249,13 +9249,14 @@ non-nil." (interactive? (let ((label (read-string "Code line label: "))) (end-of-line) - (setq link (format coderef-format label)) (let ((gc (- 79 (length link)))) (if (< (current-column) gc) (org-move-to-column gc t) (insert " "))) - (insert link) - (setq link (concat "(" label ")")) + (insert (format coderef-format label)) + (setq link (format "file:%s::%s" + org-src--source-file + (concat "(" label ")"))) (setq desc nil))) (t (setq link nil))))) @@ -9852,6 +9853,8 @@ Use TAB to complete link prefixes, then RET for type-specific completion support (setq path (expand-file-name path))) ((eq org-link-file-path-type 'relative) (setq path (file-relative-name path))) + ((eq org-link-file-path-type 'adaptive) + (setq path (file-relative-name path))) (t (save-match-data (if (string-match (concat "^" (regexp-quote -- 2.19.1