aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-03-28 18:47:46 -0400
committerStefan Monnier2014-03-28 18:47:46 -0400
commit929c0500cc92dae4d2c3be18121f455fd5b325d6 (patch)
treeb35e0aa771a59dce0c714f3ba760d39a1c3a9b2c
parent84df8b963e843007782d897d48a6bc7e4f74ad13 (diff)
downloademacs-929c0500cc92dae4d2c3be18121f455fd5b325d6.tar.gz
emacs-929c0500cc92dae4d2c3be18121f455fd5b325d6.zip
* lisp/emacs-lisp/package.el (package-built-in-p): Treat a min-version of
0 like nil.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/emacs-lisp/package.el2
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 970402ef86e..66d5910b280 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
12014-03-28 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/package.el (package-built-in-p): Treat a min-version of
4 0 like nil.
5
12014-03-27 Dmitry Gutov <dgutov@yandex.ru> 62014-03-27 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight 8 * progmodes/ruby-mode.el (ruby-font-lock-keywords):
4 special globals with font-lock-builtin-face. (Bug#17057) 9 Highlight special globals with font-lock-builtin-face. (Bug#17057)
5 10
6 * progmodes/ruby-mode.el (ruby-syntax-propertize-function): 11 * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
7 Don't propertize `?' or `!' as symbol constituent when after 12 Don't propertize `?' or `!' as symbol constituent when after
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 17136437cf9..7be0354992f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -536,7 +536,7 @@ specifying the minimum acceptable version."
536 (let ((bi (assq package package--builtin-versions))) 536 (let ((bi (assq package package--builtin-versions)))
537 (cond 537 (cond
538 (bi (version-list-<= min-version (cdr bi))) 538 (bi (version-list-<= min-version (cdr bi)))
539 (min-version nil) 539 ((remove 0 min-version) nil)
540 (t 540 (t
541 (require 'finder-inf nil t) ; For `package--builtins'. 541 (require 'finder-inf nil t) ; For `package--builtins'.
542 (assq package package--builtins)))))) 542 (assq package package--builtins))))))