mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2023-06-07 20:34:23 +03:00
parent 16f15f9665 f2e71ee726
commit c9f3de6e8f
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -16307,7 +16307,8 @@ conventions:
2. Its description consists in a single link of the previous 2. Its description consists in a single link of the previous
type. In this case, that link must be a well-formed plain type. In this case, that link must be a well-formed plain
or angle link, i.e., it must have an explicit \"file\" type. or angle link, i.e., it must have an explicit \"file\" or
\"attachment\" type.
Equip each image with the key-map `image-map'. Equip each image with the key-map `image-map'.
@ -16338,7 +16339,7 @@ buffer boundaries with possible narrowing."
;; "file:" links. Also check link abbreviations since ;; "file:" links. Also check link abbreviations since
;; some might expand to "file" links. ;; some might expand to "file" links.
(file-types-re (file-types-re
(format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?file:\\)" (format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?\\(?:file\\|attachment\\):\\)"
(if (not link-abbrevs) "" (if (not link-abbrevs) ""
(concat "\\|" (regexp-opt link-abbrevs)))))) (concat "\\|" (regexp-opt link-abbrevs))))))
(while (re-search-forward file-types-re end t) (while (re-search-forward file-types-re end t)
@ -16377,7 +16378,9 @@ buffer boundaries with possible narrowing."
;; description. ;; description.
(= (org-element-property :contents-end link) (= (org-element-property :contents-end link)
(match-end 0)) (match-end 0))
(match-string 2))))))) (progn
(setq linktype (match-string 1))
(match-string 2))))))))
(when (and path (string-match-p file-extension-re path)) (when (and path (string-match-p file-extension-re path))
(let ((file (if (equal "attachment" linktype) (let ((file (if (equal "attachment" linktype)
(progn (progn