aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Baumes2013-02-12 20:59:06 -0800
committerGlenn Morris2013-02-12 20:59:06 -0800
commita7da01148a7bb74dfb61773c1acc4b4693ae5a18 (patch)
treede76f5d1dd04710f934ac1e51e289f5115c90ab1
parent01fcc3a532872b29784a4d888ab9cc1aef0eed01 (diff)
downloademacs-a7da01148a7bb74dfb61773c1acc4b4693ae5a18.tar.gz
emacs-a7da01148a7bb74dfb61773c1acc4b4693ae5a18.zip
* package.el (package-menu-execute): Add optional noquery argument (tiny change)
Fixes: debbugs:13625
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/package.el14
2 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1d7f0013b3..ea224c5df2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-02-12 Yves Baumes <ybaumes@gmail.com> (tiny change)
2
3 * lisp/emacs-lisp/package.el (package-menu-execute):
4 Add optional noquery argument. (Bug#13625)
5
12013-02-13 Michael Albinus <michael.albinus@gmx.de> 62013-02-13 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error, 8 * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index dd828691158..23cdbd95550 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1591,7 +1591,7 @@ call will upgrade the package."
1591 (length upgrades) 1591 (length upgrades)
1592 (if (= (length upgrades) 1) "" "s"))))) 1592 (if (= (length upgrades) 1) "" "s")))))
1593 1593
1594(defun package-menu-execute () 1594(defun package-menu-execute (&optional noquery)
1595 "Perform marked Package Menu actions. 1595 "Perform marked Package Menu actions.
1596Packages marked for installation are downloaded and installed; 1596Packages marked for installation are downloaded and installed;
1597packages marked for deletion are removed." 1597packages marked for deletion are removed."
@@ -1614,16 +1614,20 @@ packages marked for deletion are removed."
1614 (push (car id) install-list)))) 1614 (push (car id) install-list))))
1615 (forward-line))) 1615 (forward-line)))
1616 (when install-list 1616 (when install-list
1617 (if (yes-or-no-p 1617 (if (or
1618 noquery
1619 (yes-or-no-p
1618 (if (= (length install-list) 1) 1620 (if (= (length install-list) 1)
1619 (format "Install package `%s'? " (car install-list)) 1621 (format "Install package `%s'? " (car install-list))
1620 (format "Install these %d packages (%s)? " 1622 (format "Install these %d packages (%s)? "
1621 (length install-list) 1623 (length install-list)
1622 (mapconcat 'symbol-name install-list ", ")))) 1624 (mapconcat 'symbol-name install-list ", ")))))
1623 (mapc 'package-install install-list))) 1625 (mapc 'package-install install-list)))
1624 ;; Delete packages, prompting if necessary. 1626 ;; Delete packages, prompting if necessary.
1625 (when delete-list 1627 (when delete-list
1626 (if (yes-or-no-p 1628 (if (or
1629 noquery
1630 (yes-or-no-p
1627 (if (= (length delete-list) 1) 1631 (if (= (length delete-list) 1)
1628 (format "Delete package `%s-%s'? " 1632 (format "Delete package `%s-%s'? "
1629 (caar delete-list) 1633 (caar delete-list)
@@ -1633,7 +1637,7 @@ packages marked for deletion are removed."
1633 (mapconcat (lambda (elt) 1637 (mapconcat (lambda (elt)
1634 (concat (car elt) "-" (cdr elt))) 1638 (concat (car elt) "-" (cdr elt)))
1635 delete-list 1639 delete-list
1636 ", ")))) 1640 ", ")))))
1637 (dolist (elt delete-list) 1641 (dolist (elt delete-list)
1638 (condition-case-unless-debug err 1642 (condition-case-unless-debug err
1639 (package-delete (car elt) (cdr elt)) 1643 (package-delete (car elt) (cdr elt))