diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-01-11 11:31:51 (GMT) |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-01-11 11:31:51 (GMT) |
| commit | 69133332aa626d499fe1a8c87ddfdc5a32f43230 (patch) | |
| tree | 590ae3cb4094070a9cff9216533b55e4012ca92f | |
| parent | db7ece9fa2e27944d9482961af9bfd9d08bb3b51 (diff) | |
| parent | de10210cf9805df3e4df1f807d0c609f6f24f296 (diff) | |
| download | org-mode-69133332aa626d499fe1a8c87ddfdc5a32f43230.zip org-mode-69133332aa626d499fe1a8c87ddfdc5a32f43230.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/org.el b/lisp/org.el index b31cedd..effb231 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9893,12 +9893,14 @@ application the system uses for this file type." "[ \t]:[^ \t\n]+:[ \t]*$"))) (not (get-text-property (point) 'org-linked-text))) (or (let* ((lkall (org-offer-links-in-entry (current-buffer) (point) arg)) - (lk (car lkall)) + (lk0 (car lkall)) + (lk (if (stringp lk0) (list lk0) lk0)) (lkend (cdr lkall))) - (when lk - (prog1 (search-forward lk nil lkend) - (goto-char (match-beginning 0)) - (org-open-at-point)))) + (mapcar (lambda(l) + (search-forward l nil lkend) + (goto-char (match-beginning 0)) + (org-open-at-point)) + lk)) (progn (require 'org-attach) (org-attach-reveal 'if-exists)))) ((run-hook-with-args-until-success 'org-open-at-point-functions)) ((and (org-at-timestamp-p t) |