[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107975: * emacs-lisp/package.el (package-built-in-p): Handle `emacs' package.

[Chong Yidong]

------------------------------------------------------------
revno: 107975
fixes bug(s): http://debbugs.gnu.org/11410
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-05-06 12:05:43 +0800
message:
  * emacs-lisp/package.el (package-built-in-p): Handle `emacs' package.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-05 05:13:27 +0000
+++ b/lisp/ChangeLog    2012-05-06 04:05:43 +0000
@@ -1,3 +1,8 @@
+2012-05-06  Chong Yidong  <address@hidden>
+
+       * emacs-lisp/package.el (package-built-in-p): Handle the `emacs'
+       package (Bug#11410).
+
 2012-05-05  Chong Yidong  <address@hidden>
 
        * emacs-lisp/package.el (package-buffer-info): Avoid putting local

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2012-05-05 05:13:27 +0000
+++ b/lisp/emacs-lisp/package.el        2012-05-06 04:05:43 +0000
@@ -469,8 +469,11 @@
 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