summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2016-05-18 20:09:24 -0300
committerArtur Malabarba <bruce.connor.am@gmail.com>2016-05-18 20:09:24 -0300
commitebc3a94e27ec9dcbe24790795741c062bed2c1a0 (patch)
tree90908302df4ca5da017b44e4e31f98d66aa30a9a /lisp/emacs-lisp
parent6e7129551ca2ff67732549ae8b1b43276c410c95 (diff)
downloademacs-ebc3a94e27ec9dcbe24790795741c062bed2c1a0.tar.gz
emacs-ebc3a94e27ec9dcbe24790795741c062bed2c1a0.tar.bz2
emacs-ebc3a94e27ec9dcbe24790795741c062bed2c1a0.zip
* lisp/emacs-lisp/package.el: Fix free variable warnings.
(package--with-response-buffer): Replace two usages of `macroexp-let2*' with `let'.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el74
1 files changed, 37 insertions, 37 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index aa18c2d30bc..8f309cb798f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1154,44 +1154,44 @@ errors signaled by ERROR-FORM or by BODY).
(while (keywordp (car body))
(setq body (cdr (cdr body))))
(macroexp-let2* nil ((url-1 url)
- (url-sym (make-symbol "url"))
- (b-sym (make-symbol "b-sym"))
(noerror-1 noerror))
- `(cl-macrolet ((unless-error (body-2 &rest before-body)
- (let ((err (make-symbol "err")))
- `(with-temp-buffer
- (when (condition-case ,err
- (progn ,@before-body t)
- ,(list 'error ',error-form
- (list 'unless ',noerror-1
- `(signal (car ,err) (cdr ,err)))))
- ,@body-2)))))
- (if (string-match-p "\\`https?:" ,url-1)
- (let ((,url-sym (concat ,url-1 ,file)))
- (if ,async
- (unless-error nil
- (url-retrieve ,url-sym
- (lambda (status)
- (let ((,b-sym (current-buffer)))
- (require 'url-handlers)
- (unless-error ,body
- (when-let ((er (plist-get status :error)))
- (error "Error retrieving: %s %S" ,url-sym er))
- (with-current-buffer ,b-sym
- (goto-char (point-min))
- (unless (search-forward-regexp "^\r?\n\r?" nil 'noerror)
- (error "Error retrieving: %s %S" ,url-sym "incomprehensible buffer")))
- (url-insert-buffer-contents ,b-sym ,url-sym)
- (kill-buffer ,b-sym)
- (goto-char (point-min)))))
- nil
- 'silent))
- (unless-error ,body (url-insert-file-contents ,url-sym))))
- (unless-error ,body
- (let ((url (expand-file-name ,file ,url-1)))
- (unless (file-name-absolute-p url)
- (error "Location %s is not a url nor an absolute file name" url))
- (insert-file-contents url)))))))
+ (let ((url-sym (make-symbol "url"))
+ (b-sym (make-symbol "b-sym")))
+ `(cl-macrolet ((unless-error (body-2 &rest before-body)
+ (let ((err (make-symbol "err")))
+ `(with-temp-buffer
+ (when (condition-case ,err
+ (progn ,@before-body t)
+ ,(list 'error ',error-form
+ (list 'unless ',noerror-1
+ `(signal (car ,err) (cdr ,err)))))
+ ,@body-2)))))
+ (if (string-match-p "\\`https?:" ,url-1)
+ (let ((,url-sym (concat ,url-1 ,file)))
+ (if ,async
+ (unless-error nil
+ (url-retrieve ,url-sym
+ (lambda (status)
+ (let ((,b-sym (current-buffer)))
+ (require 'url-handlers)
+ (unless-error ,body
+ (when-let ((er (plist-get status :error)))
+ (error "Error retrieving: %s %S" ,url-sym er))
+ (with-current-buffer ,b-sym
+ (goto-char (point-min))
+ (unless (search-forward-regexp "^\r?\n\r?" nil 'noerror)
+ (error "Error retrieving: %s %S" ,url-sym "incomprehensible buffer")))
+ (url-insert-buffer-contents ,b-sym ,url-sym)
+ (kill-buffer ,b-sym)
+ (goto-char (point-min)))))
+ nil
+ 'silent))
+ (unless-error ,body (url-insert-file-contents ,url-sym))))
+ (unless-error ,body
+ (let ((url (expand-file-name ,file ,url-1)))
+ (unless (file-name-absolute-p url)
+ (error "Location %s is not a url nor an absolute file name" url))
+ (insert-file-contents url))))))))
(define-error 'bad-signature "Failed to verify signature")