From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sBSIDcYJC2F5mQAAgWs5BA (envelope-from ) for ; Wed, 04 Aug 2021 23:42:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id oFtkCcYJC2HJXQAA1q6Kng (envelope-from ) for ; Wed, 04 Aug 2021 21:42:30 +0000 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 82F18194E0 for ; Wed, 4 Aug 2021 23:42:29 +0200 (CEST) Received: from localhost ([::1]:49558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBOei-0002Aj-Hu for larch@yhetil.org; Wed, 04 Aug 2021 17:42:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBOe1-00027I-Vi for emacs-orgmode@gnu.org; Wed, 04 Aug 2021 17:41:45 -0400 Received: from forward104j.mail.yandex.net ([5.45.198.247]:42362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBOe0-0001c0-8o for emacs-orgmode@gnu.org; Wed, 04 Aug 2021 17:41:45 -0400 Received: from forward100q.mail.yandex.net (forward100q.mail.yandex.net [IPv6:2a02:6b8:c0e:4b:0:640:4012:bb97]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 9F32B4A046C for ; Thu, 5 Aug 2021 00:41:41 +0300 (MSK) Received: from vla1-0a21544ac5fe.qloud-c.yandex.net (vla1-0a21544ac5fe.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:1686:0:640:a21:544a]) by forward100q.mail.yandex.net (Yandex) with ESMTP id 985137080002 for ; Thu, 5 Aug 2021 00:41:41 +0300 (MSK) Received: from vla3-178a3f795968.qloud-c.yandex.net (vla3-178a3f795968.qloud-c.yandex.net [2a02:6b8:c15:2584:0:640:178a:3f79]) by vla1-0a21544ac5fe.qloud-c.yandex.net (mxback/Yandex) with ESMTP id jobTrPclEc-ffHC0AKc; Thu, 05 Aug 2021 00:41:41 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ya.ru; s=mail; t=1628113301; bh=R736SReyXjnDgkMweo2Gkv/2/XHHdtRhtRM1wbYYVlU=; h=In-Reply-To:References:Date:Message-ID:From:To:Subject; b=LbgtoP06Mm86ugvNos2ZDPsL8A6XlBd9qASLI5wMad+H2VhZ41HCy8LZAJNNTIeaw yeQ4cbiiyGA2X11ao1JCTrci3zInFxuEZlxTgIzsyRqoCZ7xRuMWQHNdJlNSKDvY2U B0ps6qmNoYmlekarOfM+Kq3jwKcGELGNeBh2emlQ= Received: by vla3-178a3f795968.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id TfxSeGxx4w-feLCjsaD; Thu, 05 Aug 2021 00:41:41 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Subject: [PATCH] org-agenda.el: Avoid dependency on subr-x To: emacs-orgmode@gnu.org References: <09a29a60-b254-9207-0d44-eaf0b1ba964b@ya.ru> From: =?UTF-8?B?0JLRj9GH0LXRgdC70LDQsiDQk9GA0LjRiNC40L0=?= Message-ID: Date: Thu, 5 Aug 2021 00:41:40 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: ru-RU Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=5.45.198.247; envelope-from=w201403@ya.ru; helo=forward104j.mail.yandex.net X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628113349; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=R736SReyXjnDgkMweo2Gkv/2/XHHdtRhtRM1wbYYVlU=; b=JYOCnCX5XvSVJoW7p7Le4QPlOBICjUDm6aEPWS8H/1pWEHXXd6LfXcIJoIzVJVhECFrShy w862gWPPIwu4mYUNQEretxN+oxV1qHcoYrT+NxNMEZnLfy84w5Wm7Q9HF768ZDWExIiDMP iEMdbkIUgxEladeBpvgMU6Vp2+noKyak6vibhmx1OW28su30yIVrbO2niIRbCP81td5Lun zrpvqxWn1yx3fAImEiiCgBW69dLa7+z0xRkd7woB/nvw1iMg72OiFUnjoGcwjqn6XG1WHs Hlz6HX9sG9/CDeO3WQbmLPAcFVY7rOkhxp/HhAAaSVGWv9xxruc0fYD9zhRTpw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628113349; a=rsa-sha256; cv=none; b=s8GxbVFgtIsrymesurBh7Q5jC5M0Ag8wZdIWnm9cvwca/2/0gVKItlOTqb8IiWvrJcH0/Q NyRoOI/GZDN20VGK6tNCNBM9wCinKwmEvVSG59lJgw2/T4c5Jcy+MSa9FOqCGO1MwSjz7e mhmiDULCiATbGynC2LiDin3Tiz/9189T0VUXy+cKbE2JRwkifekq5bvThjD2kDfmfBZaiB Cg3cyabnzzM4yeJ1XAKAJtXQWTz29zh2oQc205bsUJosMeX2InJ31VP/15k8T6xbm77yg+ OsIVB3IZQK7avhfbdQ6/ffeb3WDJaMPlO9aBlX9DE2DHrJKaUozLkkrLDFol8g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=ya.ru header.s=mail header.b=LbgtoP06; dmarc=pass (policy=none) header.from=ya.ru; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -3.11 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=ya.ru header.s=mail header.b=LbgtoP06; dmarc=pass (policy=none) header.from=ya.ru; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 82F18194E0 X-Spam-Score: -3.11 X-Migadu-Scanner: scn1.migadu.com X-TUID: EEsetV389v+d Thank you very much, Maxim. Now I don't know if I need to do something extra, because the problem arose because of my mistake. When I removed the second version of Org and the extra code from .emacs, everything worked. I don't know how to explain it, because I'm just starting to learn emacs and lisp On 04.08.2021 18:20, Maxim Nikulin wrote: > * lisp/org-agenda.el (org-agenda-highlight-todo): Do not use `string-empty-p'. > > Restore compatibility with Emacs-24.3. > --- > lisp/org-agenda.el | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el > index c3fbabc01..b6cd895bc 100644 > --- a/lisp/org-agenda.el > +++ b/lisp/org-agenda.el > @@ -7080,7 +7080,7 @@ The optional argument TYPE tells the agenda type." > (setq x > (concat > (substring x 0 (match-end 1)) > - (unless (string-empty-p org-agenda-todo-keyword-format) > + (unless (string= org-agenda-todo-keyword-format "") > (format org-agenda-todo-keyword-format > (match-string 2 x))) > ;; Remove `display' property as the icon could leak >