summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/package.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-03-22 16:11:53 +0000
committerAndrea Corallo <akrl@sdf.org>2020-03-22 16:11:53 +0000
commiteb1d22b136a3f7a49b4060553b79ee188f55a498 (patch)
tree9f9e5ddc960b8484bc6e9413ee7bb155abb066f3 /lisp/emacs-lisp/package.el
parent855940df6bde5ed41ed55336a3ac6f6ae0c6267e (diff)
parent813478c8557541efa918de18f7d863a33210a598 (diff)
downloademacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.tar.gz
emacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.tar.bz2
emacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/package.el')
-rw-r--r--lisp/emacs-lisp/package.el5
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f5a9055b5b7..4312ab9ca9a 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -3179,15 +3179,12 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
(defun package-menu--refresh-contents (&optional _arg _noconfirm)
"In Package Menu, download the Emacs Lisp package archive.
Fetch the contents of each archive specified in
-`package-archives', and then refresh the package menu. Signal a
-user-error if there is already a refresh running asynchronously.
+`package-archives', and then refresh the package menu.
`package-menu-mode' sets `revert-buffer-function' to this
function. The args ARG and NOCONFIRM, passed from
`revert-buffer', are ignored."
(package--ensure-package-menu-mode)
- (when (and package-menu-async package--downloads-in-progress)
- (user-error "Package refresh is already in progress, please wait..."))
(setq package-menu--old-archive-contents package-archive-contents)
(setq package-menu--new-package-list nil)
(package-refresh-contents package-menu-async))