* [PATCH] Bugfix open 1 link from list; doc more link types
@ 2011-11-26 9:41 Michael Brand
2011-12-11 17:19 ` Bastien
0 siblings, 1 reply; 2+ messages in thread
From: Michael Brand @ 2011-11-26 9:41 UTC (permalink / raw)
To: Org Mode
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
Hi all
Bugfix open 1 link from list; doc more link types
* doc/org.texi (External links): Document the link types file+sys and
file+emacs, slightly narrow used page width.
* lisp/org.el (org-offer-links-in-entry): Make list when assigning a
single link.
"M-1 C-c C-o" or (org-open-at-point 1) or (org-offer-links-in-entry 1)
on a headline followed by two links enters Lisp error. Both changes
are remainders of the commit release_6.33f-189-g3e0c61d.
Michael
[-- Attachment #2: 0001-Bugfix-open-1-link-from-list-doc-more-link-types.patch.txt --]
[-- Type: text/plain, Size: 2720 bytes --]
From 74b56643881618a030252959722a83a4b8720c79 Mon Sep 17 00:00:00 2001
From: Michael Brand <michael.ch.brand@gmail.com>
Date: Sat, 26 Nov 2011 10:39:54 +0100
Subject: [PATCH] Bugfix open 1 link from list; doc more link types
* doc/org.texi (External links): Document the link types file+sys and
file+emacs, slightly narrow used page width.
* lisp/org.el (org-offer-links-in-entry): Make list when assigning a
single link.
"M-1 C-c C-o" or (org-open-at-point 1) or (org-offer-links-in-entry 1)
on a headline followed by two links enters Lisp error. Both changes
are remainders of the commit release_6.33f-189-g3e0c61d.
---
doc/org.texi | 6 ++++--
lisp/org.el | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/doc/org.texi b/doc/org.texi
index fdad8ba..833e969 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3170,7 +3170,7 @@ @section External links
./papers/last.pdf @r{same as above}
file:/myself@@some.where:papers/last.pdf @r{file, path on remote machine}
/myself@@some.where:papers/last.pdf @r{same as above}
-file:sometextfile::NNN @r{file with line number to jump to}
+file:sometextfile::NNN @r{file, jump to line number}
file:projects.org @r{another Org file}
file:projects.org::some words @r{text search in Org file}@footnote{
The actual behavior of the search will depend on the value of
@@ -3180,7 +3180,9 @@ @section External links
then an exact headline will be searched; if it is not found, then the user
will be queried to create it.}
file:projects.org::*task title @r{heading search in Org file}
-docview:papers/last.pdf::NNN @r{open file in doc-view mode at page NNN}
+file+sys:/path/to/file @r{open via OS, like double-click}
+file+emacs:/path/to/file @r{force opening by Emacs}
+docview:papers/last.pdf::NNN @r{open in doc-view mode at page}
id:B7423F4D-2E8A-471B-8810-C40F074717E9 @r{Link to heading by ID}
news:comp.emacs @r{Usenet link}
mailto:adent@@galaxy.net @r{Mail link}
diff --git a/lisp/org.el b/lisp/org.el
index c10aa11..2dc9060 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9678,7 +9678,7 @@ (defun org-offer-links-in-entry (&optional nth zero)
((equal (length links) 1)
(setq link (list (car links))))
((and (integerp nth) (>= (length links) (if have-zero (1+ nth) nth)))
- (setq link (nth (if have-zero nth (1- nth)) links)))
+ (setq link (list (nth (if have-zero nth (1- nth)) links))))
(t ; we have to select a link
(save-excursion
(save-window-excursion
--
1.7.4.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Bugfix open 1 link from list; doc more link types
2011-11-26 9:41 [PATCH] Bugfix open 1 link from list; doc more link types Michael Brand
@ 2011-12-11 17:19 ` Bastien
0 siblings, 0 replies; 2+ messages in thread
From: Bastien @ 2011-12-11 17:19 UTC (permalink / raw)
To: Michael Brand; +Cc: Org Mode
Hi Michael,
Michael Brand <michael.ch.brand@gmail.com> writes:
> Bugfix open 1 link from list; doc more link types
>
> * doc/org.texi (External links): Document the link types file+sys and
> file+emacs, slightly narrow used page width.
> * lisp/org.el (org-offer-links-in-entry): Make list when assigning a
> single link.
>
> "M-1 C-c C-o" or (org-open-at-point 1) or (org-offer-links-in-entry 1)
> on a headline followed by two links enters Lisp error. Both changes
> are remainders of the commit release_6.33f-189-g3e0c61d.
Applied, thanks, and sorry for the delay.
Best,
--
Bastien
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-11 17:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-26 9:41 [PATCH] Bugfix open 1 link from list; doc more link types Michael Brand
2011-12-11 17:19 ` Bastien
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).