Browse Source

org.el (org-store-link): Fix bugs

* org.el (org-store-link): Ensure desc is not nil before
matching a regexp against it.
Bastien Guerry 11 years ago
parent
commit
0cf58595d7
1 changed files with 5 additions and 4 deletions
  1. 5 4
      lisp/org.el

+ 5 - 4
lisp/org.el

@@ -9524,8 +9524,9 @@ active region."
 	   ;; Store a link using the ID at point
 	   ;; Store a link using the ID at point
 	   (setq link (condition-case nil
 	   (setq link (condition-case nil
 			  (prog1 (org-id-store-link)
 			  (prog1 (org-id-store-link)
-			    (setq desc (plist-get org-store-link-plist
-						  :description)))
+			    (setq desc (or (plist-get org-store-link-plist
+						      :description)
+					   "")))
 			(error
 			(error
 			 ;; Probably before first headline, link only to file
 			 ;; Probably before first headline, link only to file
 			 (concat "file:"
 			 (concat "file:"
@@ -9586,9 +9587,9 @@ active region."
        ;; We're done setting link and desc, clean up
        ;; We're done setting link and desc, clean up
        (if (consp link) (setq cpltxt (car link) link (cdr link)))
        (if (consp link) (setq cpltxt (car link) link (cdr link)))
        (setq link (or link cpltxt)
        (setq link (or link cpltxt)
-	     desc (or desc cpltxt ""))
+	     desc (or desc cpltxt))
        (cond ((equal desc "NONE") (setq desc nil))
        (cond ((equal desc "NONE") (setq desc nil))
-	     ((string-match org-bracket-link-analytic-regexp desc)
+	     ((and desc (string-match org-bracket-link-analytic-regexp desc))
 	      (let ((d0 (match-string 3 desc))
 	      (let ((d0 (match-string 3 desc))
 		    (p0 (match-string 5 desc)))
 		    (p0 (match-string 5 desc)))
 		(setq desc
 		(setq desc