ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-01-11 12:31:51 +01:00
parent db7ece9fa2 de10210cf9
commit 69133332aa
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org.el
View File

@ -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)