From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Protesilaos Stavrou Newsgroups: gmane.emacs.bugs Subject: bug#46964: [ELPA]: [PATCH] Replace modus-*-theme with modus-themes from :core Date: Sun, 07 Mar 2021 09:32:49 +0200 Message-ID: <87mtvfpgf2.fsf@protesilaos.com> References: <87y2f0fq8v.fsf@protesilaos.com> <87sg58tkg7.fsf@tcd.ie> <87h7lofe6b.fsf@protesilaos.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15368"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: "Basil L. Contovounesios" , 46964@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Mar 07 08:34:09 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lInvV-0003rM-RX for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 07 Mar 2021 08:34:09 +0100 Original-Received: from localhost ([::1]:52302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lInvU-0003Bs-Ts for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 07 Mar 2021 02:34:08 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lInvO-0003BY-Lk for bug-gnu-emacs@gnu.org; Sun, 07 Mar 2021 02:34:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:55523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lInvO-00033i-DY for bug-gnu-emacs@gnu.org; Sun, 07 Mar 2021 02:34:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lInvO-0003N8-AA for bug-gnu-emacs@gnu.org; Sun, 07 Mar 2021 02:34:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Protesilaos Stavrou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 07 Mar 2021 07:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46964 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 46964-submit@debbugs.gnu.org id=B46964.161510238212880 (code B ref 46964); Sun, 07 Mar 2021 07:34:02 +0000 Original-Received: (at 46964) by debbugs.gnu.org; 7 Mar 2021 07:33:02 +0000 Original-Received: from localhost ([127.0.0.1]:38836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lInuP-0003Lb-Em for submit@debbugs.gnu.org; Sun, 07 Mar 2021 02:33:01 -0500 Original-Received: from relay5-d.mail.gandi.net ([217.70.183.197]:47075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lInuN-0003LI-II for 46964@debbugs.gnu.org; Sun, 07 Mar 2021 02:33:00 -0500 X-Originating-IP: 94.46.225.161 Original-Received: from kronos (unknown [94.46.225.161]) (Authenticated sender: public@protesilaos.com) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id CCFD91C0005; Sun, 7 Mar 2021 07:32:51 +0000 (UTC) In-Reply-To: (Stefan Monnier's message of "Sat, 06 Mar 2021 13:35:24 -0500") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:201728 Archived-At: --=-=-= Content-Type: text/plain On 2021-03-06, 13:35 -0500, Stefan Monnier wrote: >> I tried with this: >> >> ("modus-themes" >> :core ("etc/themes/modus-themes.el" >> "etc/themes/modus-operandi-theme.el" >> "etc/themes/modus-vivendi-theme.el") >> :doc "doc/misc/modus-themes.org") > > I think you need something like: > > ("modus-themes" > :core ("etc/themes/modus-themes.el" > "etc/themes/modus-operandi-theme.el" > "etc/themes/modus-vivendi-theme.el" > "doc/misc/modus-themes.org") > :doc "modus-themes.org") > > The :core brings the specified files into the directory from which we > build the package, and then the :doc tells where to find the doc in that > directory. Thank you! I have amended the patch using the format you recommended. -- Protesilaos Stavrou protesilaos.com --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Replace-modus-theme-with-modus-themes-from-core.patch >From dc32c7ff90344666c0cf857420ba3aede7c767bd Mon Sep 17 00:00:00 2001 Message-Id: From: Protesilaos Stavrou Date: Sat, 6 Mar 2021 13:14:33 +0200 Subject: [PATCH] Replace modus-*-theme with modus-themes from :core The themes 'modus-operandi' and 'modus-vivendi' are now part of emacs.git and should thus be designated as a single ':core' package. --- elpa-packages | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/elpa-packages b/elpa-packages index 30f634c1b1..3ce68f8986 100644 --- a/elpa-packages +++ b/elpa-packages @@ -208,8 +208,12 @@ ("mmm-mode" :url "https://github.com/purcell/mmm-mode.git" :auto-sync t) - ("modus-operandi-theme":url "https://gitlab.com/protesilaos/modus-themes") - ("modus-vivendi-theme" :url "https://gitlab.com/protesilaos/modus-themes") + ("modus-themes" + :core ("etc/themes/modus-themes.el" + "etc/themes/modus-operandi-theme.el" + "etc/themes/modus-vivendi-theme.el" + "doc/misc/modus-themes.org") + :doc "modus-themes.org") ("multishell" :url "https://github.com/kenmanheimer/EmacsMultishell") ("muse" :url "https://github.com/alexott/muse") ;FIXME: Not nearly in-sync ("myers" :url nil) -- 2.30.1 --=-=-=--