From: Ivan Goncharov Date: Tue, 5 Jan 2016 23:56:54 +0000 (+1300) Subject: Move :pin out of macro expansion phase fixes X-Git-Tag: emacs-29.0.90~1306^2~15^2~322^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1c78a646c;p=emacs.git Move :pin out of macro expansion phase fixes --- diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index d5226e3a9d3..a225d99810f 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -419,7 +419,7 @@ manually updated package." (let ((archive-symbol (if (symbolp archive) archive (intern archive))) (archive-name (if (stringp archive) archive (symbol-name archive)))) (if (use-package--archive-exists-p archive-symbol) - (add-to-list 'package-pinned-packages (cons package archive-name) t) + (add-to-list 'package-pinned-packages (cons package archive-name)) (error "Archive '%s' requested for package '%s' is not available." archive-name package)) (package-initialize t))) @@ -427,11 +427,10 @@ manually updated package." (defun use-package-handler/:pin (name keyword archive-name rest state) (let ((body (use-package-process-keywords name rest state)) (pin-form (if archive-name - `(use-package-pin-package ',name ,archive-name)))) - ;; We want to avoid pinning packages when the `use-package' - ;; macro is being macro-expanded by elisp completion (see - ;; `lisp--local-variables'), but still do pin packages when - ;; byte-compiling to avoid requiring `package' at runtime. + `(use-package-pin-package ',(use-package-as-symbol name) + ,archive-name)))) + ;; Pinning should occur just before ensuring + ;; See `use-package-handler/:ensure'. (if (bound-and-true-p byte-compile-current-file) (eval pin-form) ; Eval when byte-compiling, (push pin-form body)) ; or else wait until runtime.