* lisp/emacs-lisp/nadvice.el: Make it a package separate from `emacs`.

* lisp/finder.el (finder-compile-keywords): Grab version from
package--builtin-versions when available.

diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 2278e389cef6f63380cdea45181252caaf6be052..b0dd03edfd5f2bb626620136ac85916227554d40 100644 (file)
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -4,7 +4,6 @@
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: extensions, lisp, tools
-;; Package: emacs
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

diff --git a/lisp/finder.el b/lisp/finder.el
index f95049f60bd9bb32a9c336308043407c732df590..ad9441210c5a067699fe75e37e3fca6c50faaf25 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -240,7 +240,8 @@ from; the default is `load-path'."
                               (lm-synopsis))
                  version  (lm-header "version")))
          (when summary
-           (setq version (ignore-errors (version-to-list version)))
+           (setq version (or (ignore-errors (version-to-list version))
+                              (alist-get package package--builtin-versions)))
            (setq entry (assq package package--builtins))
            (cond ((null entry)
                   (push (cons package