summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2019-07-06 18:42:02 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2019-07-06 18:42:02 -0400
commit851535f58745dcfbc8798b3a34b4fea852f93a3e (patch)
tree5b5c037f158527e76ebcdb8014e568d11139442c
parentd8732a82451fea57d6efa43e704e0c693e11b517 (diff)
downloademacs-851535f58745dcfbc8798b3a34b4fea852f93a3e.tar.gz
* 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.
-rw-r--r--lisp/emacs-lisp/nadvice.el1
-rw-r--r--lisp/finder.el3
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 2278e389cef..b0dd03edfd5 100644
--- 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 f95049f60bd..ad9441210c5 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