aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2020-03-22 11:57:06 +0100
committerStefan Kangas2020-03-22 12:16:11 +0100
commit813478c8557541efa918de18f7d863a33210a598 (patch)
tree4a4b994379bfe23d71e117af8a3c2c16a8124a7a
parent1242ae904a9b7871658f11fb98da5730ea8838c9 (diff)
downloademacs-813478c8557541efa918de18f7d863a33210a598.tar.gz
emacs-813478c8557541efa918de18f7d863a33210a598.zip
Revert "Signal user-error on duplicate package refresh" (Bug#39187)
This reverts commit a6d87ea045d9df73f70765bedfb02522043efd9b.
-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])."
3179(defun package-menu--refresh-contents (&optional _arg _noconfirm) 3179(defun package-menu--refresh-contents (&optional _arg _noconfirm)
3180 "In Package Menu, download the Emacs Lisp package archive. 3180 "In Package Menu, download the Emacs Lisp package archive.
3181Fetch the contents of each archive specified in 3181Fetch the contents of each archive specified in
3182`package-archives', and then refresh the package menu. Signal a 3182`package-archives', and then refresh the package menu.
3183user-error if there is already a refresh running asynchronously.
3184 3183
3185`package-menu-mode' sets `revert-buffer-function' to this 3184`package-menu-mode' sets `revert-buffer-function' to this
3186function. The args ARG and NOCONFIRM, passed from 3185function. The args ARG and NOCONFIRM, passed from
3187`revert-buffer', are ignored." 3186`revert-buffer', are ignored."
3188 (package--ensure-package-menu-mode) 3187 (package--ensure-package-menu-mode)
3189 (when (and package-menu-async package--downloads-in-progress)
3190 (user-error "Package refresh is already in progress, please wait..."))
3191 (setq package-menu--old-archive-contents package-archive-contents) 3188 (setq package-menu--old-archive-contents package-archive-contents)
3192 (setq package-menu--new-package-list nil) 3189 (setq package-menu--new-package-list nil)
3193 (package-refresh-contents package-menu-async)) 3190 (package-refresh-contents package-menu-async))