Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org

This commit is contained in:
Juanma Barranquero 2014-04-02 17:14:50 +02:00
commit 09aba8153a
22 changed files with 172 additions and 140 deletions

View file

@ -536,7 +536,7 @@ specifying the minimum acceptable version."
(let ((bi (assq package package--builtin-versions)))
(cond
(bi (version-list-<= min-version (cdr bi)))
(min-version nil)
((remove 0 min-version) nil)
(t
(require 'finder-inf nil t) ; For `package--builtins'.
(assq package package--builtins))))))