[Emacs-diffs] master 851535f: * lisp/emacs-lisp/nadvice.el: Make it a package separate from `emacs`.

[Stefan Monnier]

branch: master
commit 851535f58745dcfbc8798b3a34b4fea852f93a3e
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * 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.
---
 lisp/emacs-lisp/nadvice.el | 1 -
 lisp/finder.el             | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 2278e38..b0dd03ed 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -4,7 +4,6 @@
 
 ;; Author: Stefan Monnier <address@hidden>
 ;; 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 f95049f..ad94412 100644
--- 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