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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-11-03 13:08:44 +01:00
parent d3756ccd84 e186cc804b
commit 1bf67e2903
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org.el
View File

@ -10520,7 +10520,8 @@ application the system uses for this file type."
((and (string= type "thisfile") ((and (string= type "thisfile")
(or (run-hook-with-args-until-success (or (run-hook-with-args-until-success
'org-open-link-functions path) 'org-open-link-functions path)
(and (string-match "^id:" link) (and link
(string-match "^id:" link)
(or (featurep 'org-id) (require 'org-id)) (or (featurep 'org-id) (require 'org-id))
(progn (progn
(funcall (nth 1 (assoc "id" org-link-protocols)) (funcall (nth 1 (assoc "id" org-link-protocols))