mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00
Code Issues Projects Releases Wiki Activity

emacs-lisp/package.el (package-reinstall): Don't change selected status.

Browse source
This commit is contained in:
Thierry Volpiatto 2015-02-02 21:35:29 +01:00 • committed by Artur Malabarba
parent e17d033781
commit 88acd70e67
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2015-02-03 Thierry Volpiatto <thierry.volpiatto@gmail.com>
* emacs-lisp/package.el (package-reinstall): Don't change package's selected status.
(package-delete): New NOSAVE argument.
2015-02-03 Michael Albinus <michael.albinus@gmx.de> 2015-02-03 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-histfile-override): Fix docstring. * net/tramp-sh.el (tramp-histfile-override): Fix docstring.

8
lisp/emacs-lisp/package.el
View file

@ -1239,7 +1239,8 @@ to `package-selected-packages'."
"Reinstall package: " "Reinstall package: "
(mapcar #'symbol-name (mapcar #'symbol-name
(mapcar #'car package-alist)))))) (mapcar #'car package-alist))))))
(package-delete (cadr (assq pkg package-alist)) t) (package-delete (cadr (assq pkg package-alist)) 'force
(memq pkg package-selected-packages))
(package-install pkg)) (package-install pkg))
(defun package-strip-rcs-id (str) (defun package-strip-rcs-id (str)
@ -1470,7 +1471,7 @@ with PKG-DESC entry removed."
(and (memq pkg (mapcar #'car (package-desc-reqs (cadr p)))) (and (memq pkg (mapcar #'car (package-desc-reqs (cadr p))))
(car p)))))) (car p))))))
(defun package-delete (pkg-desc &optional force) (defun package-delete (pkg-desc &optional force nosave)
"Delete package PKG-DESC. "Delete package PKG-DESC.
Argument PKG-DESC is a full description of package as vector. Argument PKG-DESC is a full description of package as vector.
@ -1506,7 +1507,8 @@ elsewhere."
(unless (cdr pkgs) (unless (cdr pkgs)
(setq package-alist (delq pkgs package-alist)))) (setq package-alist (delq pkgs package-alist))))
;; Update package-selected-packages. ;; Update package-selected-packages.
(when (memq name package-selected-packages) (when (and (memq name package-selected-packages)
(null nosave))
(customize-save-variable (customize-save-variable
'package-selected-packages (remove name package-selected-packages))) 'package-selected-packages (remove name package-selected-packages)))
(message "Package `%s' deleted." (package-desc-full-name pkg-desc)))))) (message "Package `%s' deleted." (package-desc-full-name pkg-desc))))))