summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2015-06-18 09:23:54 +0100
committerArtur Malabarba <bruce.connor.am@gmail.com>2015-06-18 09:24:36 +0100
commit517ab6238a362bd0dda9af14681f5590da1df6de (patch)
tree64380b7abf49d2bf8a9cbaf7c2f2fd151584ba1a /lisp/emacs-lisp
parentc09f1d9c62de3f3ae98938c33cb37090a4390009 (diff)
downloademacs-517ab6238a362bd0dda9af14681f5590da1df6de.tar.gz
emacs-517ab6238a362bd0dda9af14681f5590da1df6de.tar.bz2
emacs-517ab6238a362bd0dda9af14681f5590da1df6de.zip
* lisp/emacs-lisp/package.el (package-menu--perform-transaction):
Properly delete packages. (Bug#20836)
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el24
1 files changed, 11 insertions, 13 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index cf1509947bd..6ce89f9890b 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2988,19 +2988,17 @@ objects removed."
(redisplay 'force)
;; Don't mark as selected, `package-menu-execute' already
;; does that.
- (package-install pkg 'dont-select)))
- ;; Once there are no more packages to install, proceed to
- ;; deletion.
- (let ((package-menu--transaction-status ":Deleting"))
- (force-mode-line-update)
- (redisplay 'force)
- (dolist (elt (package--sort-by-dependence delete-list))
- (condition-case-unless-debug err
- (let ((inhibit-message package-menu-async))
- (package-delete elt nil 'nosave))
- (error (message "Error trying to delete `%s': %S"
- (package-desc-full-name elt)
- err)))))))
+ (package-install pkg 'dont-select))))
+ (let ((package-menu--transaction-status ":Deleting"))
+ (force-mode-line-update)
+ (redisplay 'force)
+ (dolist (elt (package--sort-by-dependence delete-list))
+ (condition-case-unless-debug err
+ (let ((inhibit-message package-menu-async))
+ (package-delete elt nil 'nosave))
+ (error (message "Error trying to delete `%s': %S"
+ (package-desc-full-name elt)
+ err))))))
(defun package--update-selected-packages (add remove)
"Update the `package-selected-packages' list according to ADD and REMOVE.