* emacs-lisp/package.el (package-built-in-p): Handle `emacs' package.

Fixes: debbugs:11410

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2442582114da064c415cbb7664224d219072061c..ad22a25cfd74a9406a335c9f552282e6608201d4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-06  Chong Yidong  <cyd@gnu.org>
+
+       * emacs-lisp/package.el (package-built-in-p): Handle the `emacs'
+       package (Bug#11410).
+
 2012-05-05  Chong Yidong  <cyd@gnu.org>
 
        * emacs-lisp/package.el (package-buffer-info): Avoid putting local

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 73afdb825093e844ed41ffa23a9d0077ca3ea99b..4ed8aacf0b6b616c829a1d17467dbcfeed0d05bd 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -469,8 +469,11 @@ NAME and VERSION are both strings."
 Optional arg MIN-VERSION, if non-nil, should be a version list
 specifying the minimum acceptable version."
   (require 'finder-inf nil t) ; For `package--builtins'.
-  (let ((elt (assq package package--builtins)))
-    (and elt (version-list-<= min-version (package-desc-vers (cdr elt))))))
+  (if (eq package 'emacs)
+      (version-list-<= min-version (version-to-list emacs-version))
+    (let ((elt (assq package package--builtins)))
+      (and elt (version-list-<= min-version
+                               (package-desc-vers (cdr elt)))))))
 
 ;; This function goes ahead and activates a newer version of a package
 ;; if an older one was already activated.  This is not ideal; we'd at