procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/package.el (package-compute-transaction): Fix last fix.

Browse source 
Suggested by Donald Curtis <dcurtis@coe.edu>.

Fixes: debbugs:14082
This commit is contained in:
Stefan Monnier 2013-04-05 14:46:59 -04:00
parent 7e268e9006
commit 134abf1fae
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-04-05 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/package.el (package-compute-transaction): Fix last fix.
Suggested by Donald Curtis <dcurtis@coe.edu> (bug#14082).
2013-04-05 Jacek Chrząszcz <chrzaszcz@mimuw.edu.pl> (tiny change)
* ispell.el (ispell-set-spellchecker-params):

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

@ -809,12 +809,8 @@ but version %s required"
"Need package `%s-%s', but only %s is available"
(symbol-name next-pkg) (package-version-join next-version)
(package-version-join (package-desc-vers (cdr pkg-desc)))))
;; Only add to the transaction if we don't already have it.
(unless (memq next-pkg package-list)
(setq package-list
;; Move to front, so it gets installed early enough
;; (bug#14082).
(cons next-pkg (delq next-pkg package-list))))
;; Move to front, so it gets installed early enough (bug#14082).
(setq package-list (cons next-pkg (delq next-pkg package-list)))
(setq package-list
(package-compute-transaction package-list
(package-desc-reqs