aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Volpiatto2015-02-02 21:35:29 +0100
committerArtur Malabarba2015-02-03 11:18:46 +0000
commit88acd70e67a1096200fb18b586310a4126ea024a (patch)
tree63fdee6eaf5e7dd30c40775c3f8d70705bb53abc
parente17d033781b8cd995cf23899543025e9f9ce1e23 (diff)
downloademacs-88acd70e67a1096200fb18b586310a4126ea024a.tar.gz
emacs-88acd70e67a1096200fb18b586310a4126ea024a.zip
emacs-lisp/package.el (package-reinstall): Don't change selected status.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/package.el8
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80ee86ac958..71326266558 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-02-03 Thierry Volpiatto <thierry.volpiatto@gmail.com>
2
3 * emacs-lisp/package.el (package-reinstall): Don't change package's selected status.
4 (package-delete): New NOSAVE argument.
5
12015-02-03 Michael Albinus <michael.albinus@gmx.de> 62015-02-03 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-sh.el (tramp-histfile-override): Fix docstring. 8 * net/tramp-sh.el (tramp-histfile-override): Fix docstring.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 16271060626..869b2f03bd9 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1239,7 +1239,8 @@ to `package-selected-packages'."
1239 "Reinstall package: " 1239 "Reinstall package: "
1240 (mapcar #'symbol-name 1240 (mapcar #'symbol-name
1241 (mapcar #'car package-alist)))))) 1241 (mapcar #'car package-alist))))))
1242 (package-delete (cadr (assq pkg package-alist)) t) 1242 (package-delete (cadr (assq pkg package-alist)) 'force
1243 (memq pkg package-selected-packages))
1243 (package-install pkg)) 1244 (package-install pkg))
1244 1245
1245(defun package-strip-rcs-id (str) 1246(defun package-strip-rcs-id (str)
@@ -1470,7 +1471,7 @@ with PKG-DESC entry removed."
1470 (and (memq pkg (mapcar #'car (package-desc-reqs (cadr p)))) 1471 (and (memq pkg (mapcar #'car (package-desc-reqs (cadr p))))
1471 (car p)))))) 1472 (car p))))))
1472 1473
1473(defun package-delete (pkg-desc &optional force) 1474(defun package-delete (pkg-desc &optional force nosave)
1474 "Delete package PKG-DESC. 1475 "Delete package PKG-DESC.
1475 1476
1476Argument PKG-DESC is a full description of package as vector. 1477Argument PKG-DESC is a full description of package as vector.
@@ -1506,7 +1507,8 @@ elsewhere."
1506 (unless (cdr pkgs) 1507 (unless (cdr pkgs)
1507 (setq package-alist (delq pkgs package-alist)))) 1508 (setq package-alist (delq pkgs package-alist))))
1508 ;; Update package-selected-packages. 1509 ;; Update package-selected-packages.
1509 (when (memq name package-selected-packages) 1510 (when (and (memq name package-selected-packages)
1511 (null nosave))
1510 (customize-save-variable 1512 (customize-save-variable
1511 'package-selected-packages (remove name package-selected-packages))) 1513 'package-selected-packages (remove name package-selected-packages)))
1512 (message "Package `%s' deleted." (package-desc-full-name pkg-desc)))))) 1514 (message "Package `%s' deleted." (package-desc-full-name pkg-desc))))))