[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: nadvice compatibility in package list
From: |
Stefan Monnier |
Subject: |
Re: nadvice compatibility in package list |
Date: |
Fri, 05 Jul 2019 17:03:51 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
> (assoc 'nadvice package--builtin-versions)
> => (nadvice 1 0)
This is right.
> (assoc 'nadvice package--builtins)
> => nil
This is wrong.
Thomas Fitzsimmons <address@hidden> writes:
> diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
> index 2278e389ce..ffecb24b1a 100644
> --- a/lisp/emacs-lisp/nadvice.el
> +++ b/lisp/emacs-lisp/nadvice.el
> @@ -3,8 +3,11 @@
> ;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
>
> ;; Author: Stefan Monnier <address@hidden>
> +;; Note: Always keep this built-in nadvice version greater than any
> +;; nadvice version that has been or ever will be in GNU ELPA.
> +;; Version: 10.0.0
> ;; Keywords: extensions, lisp, tools
> -;; Package: emacs
> +;; Package: nadvice
>
> ;; 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
We already have defined its version as 1.0, so it would be better to
keep it that way. I think the only thing that really matters is to
remove the `Package: emacs` line (which is a line that explicitly
*prevents* the file from being considered as a package in its own
right).
So I think the patch below will do the trick as well.
Can you confirm?
Stefan
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 2278e389ce..b0dd03edfd 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 f95049f60b..ad9441210c 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -240,7 +240,8 @@ finder-compile-keywords
(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