Merge branch 'maint'

2013-11-03 13:08:44 +01:00 · 2013-11-03 13:08:44 +01:00 · 1bf67e2903
parent d3756ccd84 e186cc804b
commit 1bf67e2903
1 changed files with 2 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -10520,7 +10520,8 @@ application the system uses for this file type."
 	   ((and (string= type "thisfile")
 		 (or (run-hook-with-args-until-success
 		      'org-open-link-functions path)
-		     (and (string-match "^id:" link)
+		     (and link
+			  (string-match "^id:" link)
 			  (or (featurep 'org-id) (require 'org-id))
 			  (progn
 			    (funcall (nth 1 (assoc "id" org-link-protocols))