summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-14 11:01:32 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-14 11:01:32 +0200
commit4ffddc2a939d2157d1c8e59e949fd6b8e57eb8a6 (patch)
treea9ff1d8c44cca3e631164606f0ef5ef2e84b4414
parent8184de6e1371bc9cc5f4d4efb4660621c1d18d0a (diff)
parent5861a55740bf20ad4b209d3ba369234da004d918 (diff)
downloadorg-mode-4ffddc2a939d2157d1c8e59e949fd6b8e57eb8a6.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 2717b63..527a38c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -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.