From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Wed, 18 May 2016 23:09:24 +0000 (-0300)
Subject: * lisp/emacs-lisp/package.el: Fix free variable warnings.
X-Git-Tag: emacs-25.0.95~69
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/ebc3a94e27ec9dcbe24790795741c062bed2c1a0

* lisp/emacs-lisp/package.el: Fix free variable warnings.

(package--with-response-buffer): Replace two usages of
`macroexp-let2*' with `let'.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index aa18c2d30b..8f309cb798 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")