diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-11-15 21:28:37 +0000 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-11-15 21:35:06 +0000 |
| commit | 7cc233e1e3da297882c006c1f07c628fbd4e94d5 (patch) | |
| tree | 569440df0ffd3eb688c5956a7d6354b1f83f1713 /lisp/emacs-lisp | |
| parent | 5f9153faaf767a039620a0a05a8ad0373cb24070 (diff) | |
| download | emacs-7cc233e1e3da297882c006c1f07c628fbd4e94d5.tar.gz emacs-7cc233e1e3da297882c006c1f07c628fbd4e94d5.tar.bz2 emacs-7cc233e1e3da297882c006c1f07c628fbd4e94d5.zip | |
* lisp/emacs-lisp/package.el: Fix a decoding issue
(package--with-response-buffer): Use `url-insert-buffer-contents'.
The previous code had some issues with decoding. Refactoring that
function allows us to use the decoding from url-handlers while still
treating both sync and async requests the same.
* lisp/url/url-handlers.el (url-insert-file-contents): Move some code to
`url-insert-buffer-contents'.
(url-insert-buffer-contents): New function
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index fba07a6801e..d811db9579f 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1165,16 +1165,16 @@ BODY (does not apply to errors signaled by ERROR-FORM). (when-let ((er (plist-get status :error))) (error "Error retrieving: %s %S" url er)) (unless (search-forward-regexp "^\r?\n\r?" nil 'noerror) - (rest-error 'rest-unintelligible-result)) - (delete-region (point-min) (point)) - ,@body) - (when (buffer-live-p b) - (kill-buffer b))))))) + (error "Error retrieving: %s %S" url "incomprehensible buffer")) + (with-temp-buffer + (url-insert-buffer-contents b url) + (kill-buffer b) + (goto-char (point-min)) + ,@body))))))) (if ,async (wrap-errors (url-retrieve url callback nil 'silent)) - (let ((buffer (wrap-errors (url-retrieve-synchronously url 'silent)))) - (with-current-buffer buffer - (funcall callback nil))))) + (with-current-buffer (wrap-errors (url-retrieve-synchronously url 'silent)) + (funcall callback nil)))) (wrap-errors (with-temp-buffer (let ((url (expand-file-name ,file ,url-1))) (unless (file-name-absolute-p url) |