From 929c0500cc92dae4d2c3be18121f455fd5b325d6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 28 Mar 2014 18:47:46 -0400 Subject: [PATCH] * lisp/emacs-lisp/package.el (package-built-in-p): Treat a min-version of 0 like nil. --- lisp/ChangeLog | 9 +++++++-- lisp/emacs-lisp/package.el | 2 +- 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 @@ +2014-03-28 Stefan Monnier + + * emacs-lisp/package.el (package-built-in-p): Treat a min-version of + 0 like nil. + 2014-03-27 Dmitry Gutov - * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight - special globals with font-lock-builtin-face. (Bug#17057) + * progmodes/ruby-mode.el (ruby-font-lock-keywords): + Highlight special globals with font-lock-builtin-face. (Bug#17057) * progmodes/ruby-mode.el (ruby-syntax-propertize-function): 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." (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)))))) -- 2.39.2