diff options
| author | Michael Brand <michael.ch.brand@gmail.com> | 2011-11-26 10:39:54 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2011-12-11 18:18:40 +0100 |
| commit | 2091083323a29ea5cea001031edf8e44a4c9a861 (patch) | |
| tree | 0b2ff8c56d25b9584debd57158ce67a246e3602b | |
| parent | 8a8a56c27715740053d8a7ea2ba6411b781a22f1 (diff) | |
| download | org-mode-2091083323a29ea5cea001031edf8e44a4c9a861.tar.gz | |
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.
| -rw-r--r-- | doc/org.texi | 6 | ||||
| -rw-r--r-- | lisp/org.el | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/org.texi b/doc/org.texi index a207b6b..b51a5b4 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -3185,7 +3185,7 @@ file:papers/last.pdf @r{file, relative path} ./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 @@ -3195,7 +3195,9 @@ exact headline will be matched. If the value is @code{'query-to-create}, 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 30f92d1..eda954f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9678,7 +9678,7 @@ there is one, offer it as link number 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 |