From: "Jan Böcker" <jan.boecker@jboecker.de>
To: Matthew Lundin <mdl@imapmail.org>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: [PATCH] respect org-link-file-path-type when inserting docview: links
Date: Fri, 04 Dec 2009 12:22:56 +0100 [thread overview]
Message-ID: <4B18F110.1020708@jboecker.de> (raw)
In-Reply-To: <m2my20rrjl.fsf@fastmail.fm>
This patch is also in the docview branch at:
http://github.com/jboecker/org-docview
The function org-insert-link checks if it is inserting a "file:" link.
If this is the case, the path is manipulated according to the current
buffer file name and the variable 'org-link-file-path-type'.
I changed the regex to also match "docview:" links, and added a variable
to store the link type which is later re-attached to the path.
I do not know if there is a more elegant way, but this works.
Matthew: docview.el was missing from the Makefile because of my
inexperience with Org development, but I see that Carsten has already
fixed that one :)
---
lisp/ChangeLog | 5 +++++
lisp/org.el | 7 ++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f385b7c..a716042 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-04 Jan Böcker <jan.boecker@jboecker.de>
+
+ * org.el (org-insert-link): respect org-link-file-path-type for
+ docview: links in addition to file: links.
+
2009-12-03 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Avoid
diff --git a/lisp/org.el b/lisp/org.el
index 664bafc..4f699c9 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7976,8 +7976,9 @@ Use TAB to complete link prefixes, then RET for
type-specific completion support
(setq link search)))))
;; Check if we can/should use a relative path. If yes, simplify
the link
- (when (string-match "^file:\\(.*\\)" link)
- (let* ((path (match-string 1 link))
+ (when (string-match "^\\(file:\\|docview:\\)\\(.*\\)" link)
+ (let* ((type (match-string 1 link))
+ (path (match-string 2 link))
(origpath path)
(case-fold-search nil))
(cond
@@ -7998,7 +7999,7 @@ Use TAB to complete link prefixes, then RET for
type-specific completion support
(setq path (substring (expand-file-name path)
(match-end 0)))
(setq path (abbreviate-file-name (expand-file-name path)))))))
- (setq link (concat "file:" path))
+ (setq link (concat type path))
(if (equal desc origpath)
(setq desc path))))
--
1.6.5.2
next prev parent reply other threads:[~2009-12-04 11:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-03 15:13 Problems with org-docview Matt Lundin
2009-12-03 15:44 ` Matthew Lundin
2009-12-04 11:22 ` Jan Böcker [this message]
2009-12-09 10:44 ` [PATCH] respect org-link-file-path-type when inserting docview: links Carsten Dominik
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=4B18F110.1020708@jboecker.de \
--to=jan.boecker@jboecker.de \
--cc=emacs-orgmode@gnu.org \
--cc=mdl@imapmail.org \
/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).