mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-21 11:48:51 +00:00
Merge branch 'maint'
This commit is contained in:
commit
cec03f07b9
|
@ -9620,8 +9620,9 @@ active region."
|
|||
;; Store a link using the ID at point
|
||||
(setq link (condition-case nil
|
||||
(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
|
||||
;; Probably before first headline, link only to file
|
||||
(concat "file:"
|
||||
|
@ -9682,9 +9683,9 @@ active region."
|
|||
;; We're done setting link and desc, clean up
|
||||
(if (consp link) (setq cpltxt (car link) link (cdr link)))
|
||||
(setq link (or link cpltxt)
|
||||
desc (or desc cpltxt ""))
|
||||
desc (or desc cpltxt))
|
||||
(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))
|
||||
(p0 (match-string 5 desc)))
|
||||
(setq desc
|
||||
|
|
Loading…
Reference in a new issue