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

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

* org.el (org-store-link): Ensure desc is not nil before
matching a regexp against it.
This commit is contained in:
Bastien Guerry 2014-03-13 16:27:51 +01:00
parent 7f65ba52ee
commit 0cf58595d7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -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 (setq desc (or (plist-get org-store-link-plist
:description))) :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