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

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2023-02-26 14:43:54 +03:00
parent 351279ffae f9aeba5dd7
commit aa22497876
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org.el
View File

@ -4561,6 +4561,7 @@ is available. This option applies only if FILE is a URL."
(cache) (cache)
(is-url (is-url
(if (org--should-fetch-remote-resource-p file) (if (org--should-fetch-remote-resource-p file)
(condition-case error
(with-current-buffer (url-retrieve-synchronously file) (with-current-buffer (url-retrieve-synchronously file)
(goto-char (point-min)) (goto-char (point-min))
;; Move point to after the url-retrieve header. ;; Move point to after the url-retrieve header.
@ -4576,6 +4577,9 @@ is available. This option applies only if FILE is a URL."
"Unable to fetch file from %S" "Unable to fetch file from %S"
file) file)
nil)) nil))
(error (if noerror
(message "Org could't download \"%s\": %s %S" file (car error) (cdr error))
(signal (car error) (cdr error)))))
(funcall (if noerror #'message #'user-error) (funcall (if noerror #'message #'user-error)
"The remote resource %S is considered unsafe, and will not be downloaded." "The remote resource %S is considered unsafe, and will not be downloaded."
file))) file)))