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 wBj6NgLOCmEsNAAAgWs5BA (envelope-from ) for ; Wed, 04 Aug 2021 19:27: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 OAWVMgLOCmEbNwAA1q6Kng (envelope-from ) for ; Wed, 04 Aug 2021 17:27: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 192C01560E for ; Wed, 4 Aug 2021 19:27:30 +0200 (CEST) Received: from localhost ([::1]:50880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBKfx-0006Lc-01 for larch@yhetil.org; Wed, 04 Aug 2021 13:27:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBIhX-0005Ad-NN for emacs-orgmode@gnu.org; Wed, 04 Aug 2021 11:21:03 -0400 Received: from ciao.gmane.io ([116.202.254.214]:56916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBIhW-0004u9-A3 for emacs-orgmode@gnu.org; Wed, 04 Aug 2021 11:20:59 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1mBIhU-00011m-0o for emacs-orgmode@gnu.org; Wed, 04 Aug 2021 17:20:56 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Maxim Nikulin Subject: [PATCH] org-agenda.el: Avoid dependency on subr-x Date: Wed, 4 Aug 2021 22:20:47 +0700 Message-ID: References: <09a29a60-b254-9207-0d44-eaf0b1ba964b@ya.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 In-Reply-To: <09a29a60-b254-9207-0d44-eaf0b1ba964b@ya.ru> Content-Language: en-US Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 28 X-Spam_score: 2.8 X-Spam_bar: ++ X-Spam_report: (2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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=1628098050; 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; bh=ecBsJKVbwtRGRtWu9ydTfD6CtEwZXztQy5Mrvbn9Cdo=; b=PFY3Xx684nGp9f5pR1BNM/hRr/eCQ1y5DDvC72V1oMyHL90TlGSjZTOUtZk42fWko/xHsl 7z6HM5NNmvmqtttNlrVROMIpDXs79EuTgc0aS/ejL84oeTs2qPZkoVCg7TYK3fGZgc6r/E nuES03OevSudGGNArXxMSFKaAmf5lii4xiLFyxnM+QrTlz+6GMxs1KOh30Bsle3rtdIG+f YDvr1PkhwFWQ5BBaYe2MFcLM108qs9u1FRt3OGtYehU8DbbG45M89ZS4BNUlnmo1lwZsc+ KqAyDzq928m/lbqmUGA7y6swfd2QpcOQp+dTzvHNJuDzCOhyOmtUEC5Vd6sOwg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628098050; a=rsa-sha256; cv=none; b=cPYLLhvwKjA3OQnM8aHTgUDe4d3sM+xDyWTNaNS+FyRA9x3BBnZQu8Bpea3LCiRccSaEaL ARjBtJr40LCVstDXBS7pyY6EdDyt/GR+m+B1hZKjLOolokpOsQ7dzuLIi8iQqtGwS5kyNi t9OhSvZjjdFgBdjQW0+n/IqmAk1xuXhuuEc4muK+6/YiQcOflkcF+8Y3uNN7+CB/MLdDJo z9k/6R6Kl643740OJ3Q2/0g9yixeJf0txfSrGTvHsze9/oz89nvvZX2v/zPKiJv0YGWC3a QzGiTeY9WE0ztgigqryXbHr/WXj/GACMH9VWMrSZgYhkOIZRBuAtM7156syt/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); 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: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); 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: 192C01560E X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: lIeZTk8r/yNj * 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 -- 2.25.1