From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id EMqSM+YdC2S2HwEASxT56A (envelope-from ) for ; Fri, 10 Mar 2023 13:09:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iGKgM+YdC2StaAAA9RJhRA (envelope-from ) for ; Fri, 10 Mar 2023 13:09:10 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7B3C213EE5 for ; Fri, 10 Mar 2023 13:09:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pabYE-00018l-E9; Fri, 10 Mar 2023 07:08:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pabYC-0000zu-2r for emacs-orgmode@gnu.org; Fri, 10 Mar 2023 07:08:44 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pabY9-00036y-Ih for emacs-orgmode@gnu.org; Fri, 10 Mar 2023 07:08:43 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PY4Zr4z56z9sdP; Fri, 10 Mar 2023 13:08:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timruffing.de; s=MBO0001; t=1678450116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ig+6pnjjp8/MaD30DMPdkHokjb4vXLncPK2NaYfeKpI=; b=g/Dl9ttlVVgC8nPZeCr97mA75mvnF5Q+5hGDeA9gVIgDqo7Vj8C/05tfuymVwp8Ec/hrMt 1YPIRzpBxNL77ogccpVKDI+otgoGAk6Q35y0k3leg1v+Mjz5vZb89d1YiqfgC8cKjaAOJI r8ajh9Wzxxx9s72b6ufUrCwGjgVUlnZlZ1Iuu2N2cYpw5LLOma9aULTs2GCx+z5XTicW0H 25A7QrFqKoL0tBzc9D/iyqTOGp7MNeVUxJ/FbNj+L5jyMyQksPFhSzYqZDwdvalBA+G2k5 imZ3/cs9r933+7Mis4fRcaC0EiIqZESEQNaJkDPdU713OK9yJoQ+NuIZ3oFVCA== Message-ID: Subject: Re: [PATCH] Don't reset `org-todo-keywords-for-agenda' when org-agenda-multi From: Tim Ruffing To: Ihor Radchenko Cc: emacs-orgmode@gnu.org Date: Fri, 10 Mar 2023 13:08:35 +0100 In-Reply-To: <871qlwzv2k.fsf@localhost> References: <55a16edf3c8e04e9f1f7be7ab281ddacac81d9c1.camel@timruffing.de> <871qlwzv2k.fsf@localhost> Content-Type: multipart/mixed; boundary="=-/YdQCdSgIFD3/ebF//Oz" MIME-Version: 1.0 Received-SPF: pass client-ip=80.241.56.152; envelope-from=crypto@timruffing.de; helo=mout-p-102.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678450150; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ig+6pnjjp8/MaD30DMPdkHokjb4vXLncPK2NaYfeKpI=; b=H6YyQfkM1lzVpuaCQxFzWbZNmB+3SDwNNB+LNBul3nqgDrtBHzW6ZunR4LDnoOLrcXE9+x xrPVoDUzfa3WvCeT78Gzd4vPdv8FwnWMMLaPlttMhTvb+4/xhALyrmt3RZWeiZZ61DOE9U IPenLDVl00s5fLHmgYHO8KjUCMe88biHWl+84DNl5uQ5CXpzMelycfNWm9ZZcrUR1K2auY ORvcPhwYc8glDrHEoqqaG6hNaJji4+CGAyZmOI5tFgI55F0Tb56dg4eYvVdTy1l7Furpyg QuQdd2BDTgVVVysLVrffVGe9eIdV1ldQGYJxwmT7LKGxl4jMxm0S987/ruu6cQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=timruffing.de header.s=MBO0001 header.b="g/Dl9ttl"; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678450150; a=rsa-sha256; cv=none; b=iSIealbHNY8ipvszSM+0Q32M+7HwnQAR0+yxfwp1ZBbqxjeLyBNU/IilGSAmkbFKD5Eyg6 4mf9untCVL9cwc6gFvIBDtZflUEdNKmuLd/ZVC7bCH3jSKkRlWWxn9pokycPUNPdp1E06O duPp1D7yVYT5fVD6QA4k2ssnCGN4RxkOs3AuqDxtplZqCl7fYeCKwNFuzrMCyPjheLRuTm +xCODQGedCqSIjX90kPXkXR6HtcT7OICKnsd92WANTTfA2nycR0k4O2ZBbnuEeq7Kk+nPv 4edl2ils6ZkJLCN8xqqjEgEV43jcj6Bi4RLU7tEpqkoqHtYK+oWebTwYyr6QEg== Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=timruffing.de header.s=MBO0001 header.b="g/Dl9ttl"; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Spam-Score: -2.69 X-Spam-Score: -2.69 X-Migadu-Queue-Id: 7B3C213EE5 X-Migadu-Scanner: scn1.migadu.com X-TUID: 6AMxe2iJak5+ --=-/YdQCdSgIFD3/ebF//Oz Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attached with TINYCHECK. Unfortunately I don't have the time to write a test right now because I'll be traveling from tomorrow on. (You'd to wait for at least 6 weeks..) Here's a sketch for a test case: * Show an agenda with that has org-agenda-multi * In the agenda buffer, assert that org-todo-keywords-for-agenda and (org-done-keywords-for-agenda) are not nil. Best, Tim On Fri, 2023-03-10 at 11:48 +0000, Ihor Radchenko wrote: > Tim Ruffing writes: >=20 > > * org-agenda.el (org-prepare-agenda): Don't reset > > `org-todo-keywords-for-agenda' when org-agenda-multi. > >=20 > > Fixes a bug with TODO keywords that came to light in org-modern, > > see https://github.com/minad/org-modern/issues/26. > >=20 > > This is very similar to cd2d138883a55cad48394a3f473da8b973a99a5e, > > which fixed the same for `org-done-keywords-for-agenda` (to fix > > a similar styling issue). >=20 > Thanks for the patch! > Unfortunately, it does not apply. > Could you re-send the patch as attachment? >=20 > In addition, may you add TINYCHANGE cookie to the commit message if > you > don't have FSF assignment done (see > https://orgmode.org/worg/org-contribute.html#first-patch)? And, if > you > can, write a test. >=20 --=-/YdQCdSgIFD3/ebF//Oz Content-Disposition: attachment; filename*0=0001-Don-t-reset-org-todo-keywords-for-agenda-when-org-ag.pat; filename*1=ch Content-Type: text/x-patch; name="0001-Don-t-reset-org-todo-keywords-for-agenda-when-org-ag.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBlYzgzZTU4ZDU0MzQ1Njk2YjgwZDU1OTE0NWU0ODBjMmFmMDdkYjZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gUnVmZmluZyA8Y3J5cHRvQHRpbXJ1ZmZpbmcuZGU+CkRh dGU6IFRodSwgOSBNYXIgMjAyMyAxMzozODoyOCArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIERvbid0 IHJlc2V0IGBvcmctdG9kby1rZXl3b3Jkcy1mb3ItYWdlbmRhJyB3aGVuCiBvcmctYWdlbmRhLW11 bHRpCgoqIG9yZy1hZ2VuZGEuZWwgKG9yZy1wcmVwYXJlLWFnZW5kYSk6IERvbid0IHJlc2V0CmBv cmctdG9kby1rZXl3b3Jkcy1mb3ItYWdlbmRhJyB3aGVuIG9yZy1hZ2VuZGEtbXVsdGkuCgpGaXhl cyBhIGJ1ZyB3aXRoIFRPRE8ga2V5d29yZHMgdGhhdCBjYW1lIHRvIGxpZ2h0IGluIG9yZy1tb2Rl cm4sCnNlZSBodHRwczovL2dpdGh1Yi5jb20vbWluYWQvb3JnLW1vZGVybi9pc3N1ZXMvMjYuCgpU aGlzIGlzIHZlcnkgc2ltaWxhciB0byBjZDJkMTM4ODgzYTU1Y2FkNDgzOTRhM2Y0NzNkYThiOTcz YTk5YTVlLAp3aGljaCBmaXhlZCB0aGUgc2FtZSBmb3IgYG9yZy1kb25lLWtleXdvcmRzLWZvci1h Z2VuZGFgICh0byBmaXgKYSBzaW1pbGFyIHN0eWxpbmcgaXNzdWUpLgoKVElOWUNIQU5HRQotLS0K IGxpc3Avb3JnLWFnZW5kYS5lbCB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigr KSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLWFnZW5kYS5lbCBiL2xpc3Av b3JnLWFnZW5kYS5lbAppbmRleCA3ZTU0MTIxZGMuLjhlM2NjNjkzYSAxMDA2NDQKLS0tIGEvbGlz cC9vcmctYWdlbmRhLmVsCisrKyBiL2xpc3Avb3JnLWFnZW5kYS5lbApAQCAtMzk1Niw3ICszOTU2 LDYgQEAgRklMVEVSLUFMSVNUIGlzIGFuIGFsaXN0IG9mIGZpbHRlcnMgd2UgbmVlZCB0byBhcHBs eSB3aGVuCiAJICAobWVzc2FnZSAiU3RpY2t5IEFnZW5kYSBidWZmZXIsIHVzZSBgcicgdG8gcmVm cmVzaCIpCiAJICAob3Igb3JnLWFnZW5kYS1tdWx0aSAob3JnLWFnZW5kYS1maXQtd2luZG93LXRv LWJ1ZmZlcikpCiAJICAodGhyb3cgJ2V4aXQgIlN0aWNreSBBZ2VuZGEgYnVmZmVyLCB1c2UgYHIn IHRvIHJlZnJlc2giKSkKLSAgICAgIChzZXRxIG9yZy10b2RvLWtleXdvcmRzLWZvci1hZ2VuZGEg bmlsKQogICAgICAgKGlmIG9yZy1hZ2VuZGEtbXVsdGkKIAkgIChwcm9nbgogCSAgICAoc2V0cSBi dWZmZXItcmVhZC1vbmx5IG5pbCkKQEAgLTM5NjksNiArMzk2OCw3IEBAIEZJTFRFUi1BTElTVCBp cyBhbiBhbGlzdCBvZiBmaWx0ZXJzIHdlIG5lZWQgdG8gYXBwbHkgd2hlbgogCQkJKG1ha2Utc3Ry aW5nICh3aW5kb3ctbWF4LWNoYXJzLXBlci1saW5lKSBvcmctYWdlbmRhLWJsb2NrLXNlcGFyYXRv cikpCiAJCSAgICAgICJcbiIpKQogCSAgICAobmFycm93LXRvLXJlZ2lvbiAocG9pbnQpIChwb2lu dC1tYXgpKSkKKyAgICAgICAgKHNldHEgb3JnLXRvZG8ta2V5d29yZHMtZm9yLWFnZW5kYSBuaWwp CiAJKHNldHEgb3JnLWRvbmUta2V5d29yZHMtZm9yLWFnZW5kYSBuaWwpCiAJOzsgU2V0dGluZyBh bnkgb3JnIHZhcmlhYmxlcyB0aGF0IGFyZSBpbiBvcmctYWdlbmRhLWxvY2FsLXZhcnMKIAk7OyBs aXN0IG5lZWQgdG8gYmUgZG9uZSBhZnRlciB0aGUgcHJlcGFyZSBjYWxsCi0tIAoyLjM5LjIKCg== --=-/YdQCdSgIFD3/ebF//Oz--