From mboxrd@z Thu Jan 1 00:00:00 1970 From: stardiviner Subject: Re: coderef does not provide file path for org-insert-link when not in original buffre Date: Sat, 27 Oct 2018 10:55:52 +0800 Message-ID: <87zhv0p07b.fsf@gmail.com> References: <87po1zvw9n.fsf@gmail.com> <87bmc1tb4s.fsf@nicolasgoaziou.fr> <87va6wk3ea.fsf@gmail.com> <875zysr0bb.fsf@nicolasgoaziou.fr> <875zxst5to.fsf@gmail.com> <87bm7gg06l.fsf@nicolasgoaziou.fr> Reply-To: numbchild@gmail.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGElb-0004iH-72 for emacs-orgmode@gnu.org; Fri, 26 Oct 2018 22:56:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGElX-0005KR-Vu for emacs-orgmode@gnu.org; Fri, 26 Oct 2018 22:55:59 -0400 Received: from [61.175.244.13] (port=12555 helo=dark.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGElX-0005Jg-6M for emacs-orgmode@gnu.org; Fri, 26 Oct 2018 22:55:55 -0400 In-reply-to: <87bm7gg06l.fsf@nicolasgoaziou.fr> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Nicolas Goaziou Cc: org-mode --=-=-= Content-Type: text/plain Nicolas Goaziou writes: > Hello, > > stardiviner writes: > >> Thanks for this hint, I added a new entry in org-src--babel-info list to >> pass the original parent file path. > > Thank you. Some comments follow. > >> - (language body arguments switches name start coderef)" >> + (language body arguments switches name start coderef parent-file-path)" > > This is not needed. It would be better to create a new variable, e.g. > `org-src-source-file', get the file name at the beginning of the > function `org-src--edit-element', and set it from its INITIALIZE > argument. > >> + (insert (format coderef-format label)) >> + (setq link (format "file:%s::%s" >> + (car (last org-src--babel-info)) >> + (concat "(" label ")"))) > > You can get the file name by reading `org-src-source-file' value. > > Does that make sense? > > Could you also provide some tests? > > Regards, I regenerated the patch. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-org.el-fix-org-coderef-does-not-support-adaptive-fil.patch >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 --=-=-= Content-Type: text/plain -- [ stardiviner ] I try to make every word tell the meaning what I want to express. Blog: https://stardiviner.github.io/ IRC(freenode): stardiviner GPG: F09F650D7D674819892591401B5DF1C95AE89AC3 --=-=-=--