From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: nadvice compatibility in package list Date: Fri, 05 Jul 2019 17:03:51 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="240428"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 05 23:07:48 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hjVQn-0010Ip-VM for ged-emacs-devel@m.gmane.org; Fri, 05 Jul 2019 23:07:46 +0200 Original-Received: from localhost ([::1]:56132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVNK-0007Ro-SX for ged-emacs-devel@m.gmane.org; Fri, 05 Jul 2019 17:04:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42441) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVND-0007O6-DP for emacs-devel@gnu.org; Fri, 05 Jul 2019 17:04:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjVNC-0006n8-CL for emacs-devel@gnu.org; Fri, 05 Jul 2019 17:04:03 -0400 Original-Received: from 195-159-176-226.customer.powertech.no ([195.159.176.226]:38582 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hjVNC-0006mO-4i for emacs-devel@gnu.org; Fri, 05 Jul 2019 17:04:02 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.89) (envelope-from ) id 1hjVN8-000vyZ-WF for emacs-devel@gnu.org; Fri, 05 Jul 2019 23:03:58 +0200 X-Injected-Via-Gmane: http://gmane.org/ Cancel-Lock: sha1:RSpA+8+etGGbHKeKtCy+Q0Rf5XY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:238372 Archived-At: > (assoc 'nadvice package--builtin-versions) > => (nadvice 1 0) This is right. > (assoc 'nadvice package--builtins) > => nil This is wrong. Thomas Fitzsimmons 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 > +;; 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 ;; 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