From: Samim Pezeshki <p.samim@gmail.com> To: Ihor Radchenko <yantar92@gmail.com> Cc: emacs-orgmode@gnu.org, Nicolas Goaziou <mail@nicolasgoaziou.fr> Subject: Re: [PATCH] org-agenda: Skip formatting if format string is "" Date: Wed, 9 Feb 2022 22:44:11 +0330 [thread overview] Message-ID: <CAJAdVc1mTZVaqWW7YvuxXFPqOVrK_HNgWopSNmD_q_a_Lk+RuA@mail.gmail.com> (raw) In-Reply-To: <87v8xsuywx.fsf@localhost> [-- Attachment #1.1: Type: text/plain, Size: 1307 bytes --] Thanks Ihor for the detailed explanation, I updated the patch as you suggested. On Sun, Feb 6, 2022 at 12:53 PM Ihor Radchenko <yantar92@gmail.com> wrote: > Samim Pezeshki <p.samim@gmail.com> writes: > > > This commit prevents having extra spaces when the TODO format string is > an > > empty string (""). It was not working properly, with this patch now it > > works correctly. > > Thanks for the patch! > > > (concat > > (substring x 0 (match-end 1)) > > ... > > + (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 > > + ;; on the white space. > > + (org-add-props " " (org-plist-delete (text-properties-at 0 x) > > + 'display))) > > (substring x (match-end 3))))))) > > x))) > > Your patch will unconditionally hide todo keywords in agenda even when > org-agenda-todo-keyword-format is not empty. This will happen because > (unless ...) form will only return the last " ", but never the keyword. > > You should better wrap the (org-add-props ...) with another unless > condition. > > Best, > Ihor > [-- Attachment #1.2: Type: text/html, Size: 2128 bytes --] [-- Attachment #2: 0001-lisp-org-agenda.el-Fix-bug-in-org-agenda-highlight-t.patch --] [-- Type: text/x-patch, Size: 1733 bytes --] From 2e90cac33c22cf8ea09f7f02e644df983b7ca0d1 Mon Sep 17 00:00:00 2001 From: Samim Pezeshki <psamim@gmail.com> Date: Sat, 5 Feb 2022 20:11:19 +0330 Subject: [PATCH] lisp/org-agenda.el: Fix bug in `org-agenda-highlight-todo' * lisp/org-agenda.el (org-agenda-highlight-todo): Skip formatting the to-do keyword when `org-agenda-todo-keyword-format' is the empty string. TINYCHANGE --- lisp/org-agenda.el | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 9bc44a56e..3b6397b25 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7634,14 +7634,15 @@ The optional argument TYPE tells the agenda type." (setq x (concat (substring x 0 (match-end 1)) - (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 - ;; on the white space. - (org-add-props " " (org-plist-delete (text-properties-at 0 x) - 'display)) - (substring x (match-end 3))))))) + (unless (string= org-agenda-todo-keyword-format "") + (format org-agenda-todo-keyword-format + (match-string 2 x))) + (unless (string= org-agenda-todo-keyword-format "") + ;; Remove `display' property as the icon could leak + ;; on the white space. + (org-add-props " " (org-plist-delete (text-properties-at 0 x) + 'display))) + (substring x (match-end 3))))))) x))) (defsubst org-cmp-values (a b property) -- 2.35.1
next prev parent reply other threads:[~2022-02-09 20:01 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-05 17:02 Samim Pezeshki 2022-02-06 9:28 ` Ihor Radchenko 2022-02-09 19:14 ` Samim Pezeshki [this message] 2022-03-15 18:35 ` Samim Pezeshki 2022-03-21 7:34 ` Ihor Radchenko -- strict thread matches above, loose matches on Subject: below -- 2021-05-08 15:55 Samim Pezeshki 2021-05-15 8:12 ` Bastien
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://www.orgmode.org/ * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAJAdVc1mTZVaqWW7YvuxXFPqOVrK_HNgWopSNmD_q_a_Lk+RuA@mail.gmail.com \ --to=p.samim@gmail.com \ --cc=emacs-orgmode@gnu.org \ --cc=mail@nicolasgoaziou.fr \ --cc=yantar92@gmail.com \ --subject='Re: [PATCH] org-agenda: Skip formatting if format string is ""' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).