summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/emacs-lisp/package.el14
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3d654d5dfe..149c807f230 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
2015-02-01 Artur Malabarba <bruce.connor.am@gmail.com>
* emacs-lisp/package.el (package-selected-packages): Fix :type
+ (package-install): Rename ARG to MARK-SELECTED.
2015-02-01 Thierry Volpiatto <thierry.volpiatto@gmail.com>
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 4fa77b6d20f..c322ce8cc56 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1198,13 +1198,13 @@ using `package-compute-transaction'."
(mapc #'package-install-from-archive packages))
;;;###autoload
-(defun package-install (pkg &optional arg)
+(defun package-install (pkg &optional mark-selected)
"Install the package PKG.
PKG can be a package-desc or the package name of one the available packages
-in an archive in `package-archives'. Interactively, prompt for its name
-and add PKG to `package-selected-packages'.
-When called from lisp you will have to use ARG if you want to
-simulate an interactive call to add PKG to `package-selected-packages'."
+in an archive in `package-archives'. Interactively, prompt for its name.
+
+If called interactively or if MARK-SELECTED is non-nil, add PKG
+to `package-selected-packages'."
(interactive
(progn
;; Initialize the package system to get the list of package
@@ -1221,8 +1221,8 @@ simulate an interactive call to add PKG to `package-selected-packages'."
(symbol-name (car elt))))
package-archive-contents))
nil t))
- "\p")))
- (when (and arg (not (memq pkg package-selected-packages)))
+ t)))
+ (when (and mark-selected (not (memq pkg package-selected-packages)))
(customize-save-variable 'package-selected-packages
(cons pkg package-selected-packages)))
(package-download-transaction