Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-21 14:08:14 +02:00
commit a8a60cc7f7
1 changed files with 1 additions and 1 deletions

View File

@ -10830,7 +10830,7 @@ link in a property drawer line."
(call-interactively (read cmd)))) (call-interactively (read cmd))))
(user-error "Abort")))) (user-error "Abort"))))
((equal type "id") ((equal type "id")
(require 'ord-id) (require 'org-id)
(funcall (nth 1 (assoc "id" org-link-protocols)) path)) (funcall (nth 1 (assoc "id" org-link-protocols)) path))
((member type '("coderef" "custom-id" "fuzzy" "radio")) ((member type '("coderef" "custom-id" "fuzzy" "radio"))
(unless (run-hook-with-args-until-success (unless (run-hook-with-args-until-success