From: stardiviner <numbchild@gmail.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: org-mode <emacs-orgmode@gnu.org>
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 [thread overview]
Message-ID: <87zhv0p07b.fsf@gmail.com> (raw)
In-Reply-To: <87bm7gg06l.fsf@nicolasgoaziou.fr>
[-- Attachment #1: Type: text/plain, Size: 975 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Hello,
>
> stardiviner <numbchild@gmail.com> 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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org.el-fix-org-coderef-does-not-support-adaptive-fil.patch --]
[-- Type: text/x-patch, Size: 2802 bytes --]
From da491e12fcbf75d9b016f58fbcdeb74d601a1b91 Mon Sep 17 00:00:00 2001
From: stardiviner <numbchild@gmail.com>
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
[-- Attachment #3: Type: text/plain, Size: 224 bytes --]
--
[ 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
next prev parent reply other threads:[~2018-10-27 2:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 1:52 coderef does not provide file path for org-insert-link when not in original buffre stardiviner
2018-06-23 22:02 ` Nicolas Goaziou
2018-06-24 9:10 ` stardiviner
2018-09-23 8:46 ` stardiviner
[not found] ` <875zysr0bb.fsf@nicolasgoaziou.fr>
2018-10-24 2:51 ` stardiviner
2018-10-26 16:08 ` Nicolas Goaziou
2018-10-27 2:55 ` stardiviner [this message]
2018-11-01 17:39 ` Nicolas Goaziou
2018-11-02 6:15 ` stardiviner
2018-11-04 15:47 ` Nicolas Goaziou
2018-11-06 4:48 ` stardiviner
2018-11-06 4:48 ` [SOLVED] " stardiviner
2018-10-31 5:16 ` stardiviner
-- strict thread matches above, loose matches on Subject: below --
2018-09-26 13:18 Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zhv0p07b.fsf@gmail.com \
--to=numbchild@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).