[PATCH] Bugfix open 1 link from list; doc more link types

[Michael Brand <michael.ch.brand@gmail.com>]

[-- 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