From 25f292cd48febec5f9b133db922b3b0dc32185c3 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 6 May 2012 12:05:43 +0800 Subject: [PATCH] * emacs-lisp/package.el (package-built-in-p): Handle `emacs' package. Fixes: debbugs:11410 --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2442582114d..ad22a25cfd7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-06 Chong Yidong + + * emacs-lisp/package.el (package-built-in-p): Handle the `emacs' + package (Bug#11410). + 2012-05-05 Chong Yidong * 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 73afdb82509..4ed8aacf0b6 100644 --- 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 -- 2.11.4.GIT