mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 20:37:51 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2017-10-14 11:01:32 +02:00
parent 8184de6e13 5861a55740
commit 4ffddc2a93
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/org.el
View file

@ -5286,7 +5286,8 @@ is available. This option applies only if FILE is a URL."
;; Move point to after the url-retrieve header.
(search-forward "\n\n" nil :move)
;; Search for the success code only in the url-retrieve header.
(if (save-excursion (re-search-backward "HTTP.*\\s-+200\\s-OK" nil :noerror))
(if (save-excursion
(re-search-backward "HTTP.*\\s-+200\\s-OK" nil :noerror))
;; Update the cache `org--file-cache' and return contents.
(puthash file
(buffer-substring-no-properties (point) (point-max))
@ -5302,7 +5303,8 @@ is available. This option applies only if FILE is a URL."
(buffer-string))
(file-error
(funcall (if noerror #'message #'user-error)
(error-message-string err)))))))))
"Unable to read file %S"
file))))))))
(defun org-extract-log-state-settings (x)
"Extract the log state setting from a TODO keyword string.