From: "Gustav Wikström" <gustav@whil.se>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: "sgeorgii ." <sgeorgii@gmail.com>,
"emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>
Subject: Re: [RFC] [PATCH] Changes to Tag groups - allow nesting and regexps
Date: Wed, 25 Nov 2015 15:39:18 +0000 [thread overview]
Message-ID: <DB5PR02MB119119DB1715A7C3A4BF06BADA050@DB5PR02MB1191.eurprd02.prod.outlook.com> (raw)
In-Reply-To: <87r3je8723.fsf@nicolasgoaziou.fr>
[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]
Hi,
Taking your comments and improving the first patch a bit resulted in the attached one. It replaces the previous. Using string-prefix-p and string-suffix-p solves the out of index problem in the substrings.
BR
Gustav
> -----Original Message-----
> From: Nicolas Goaziou [mailto:mail@nicolasgoaziou.fr]
> Sent: Wednesday, November 25, 2015 15:53
> To: Gustav Wikström <gustav@whil.se>
> Cc: emacs-orgmode@gnu.org; sgeorgii . <sgeorgii@gmail.com>
> Subject: Re: [O] [RFC] [PATCH] Changes to Tag groups - allow nesting and
> regexps
>
> Gustav Wikström <gustav@whil.se> writes:
>
> > Hmm, since the error was thrown when trying to look at indexes outside
> > of the string in (substring ... ), I don't see how isregexp can be
> > left as is. We have to make sure the substring-code is not evaluated
> > if the tag is empty. What am I missing?
>
> Nothing, I was clear as mud.
>
> (cond
> ((string= "" tag) (setq f1 '(not tags)))
> ((and (equal "{" ...)
> (equal "}"...))
> ...)
> (t ...))
>
> Or even
>
> ((and (string-prefix-p "{" ...)
> (string-suffix-p "}" ...)))
>
> on master.
>
> Regards,
[-- Attachment #2: 0001-org-agenda-Filter-empty-tags.patch --]
[-- Type: application/octet-stream, Size: 1321 bytes --]
From e5a86a3e89f5d624945b2f5b563c6e9c4aa95cbc Mon Sep 17 00:00:00 2001
From: Gustav Wikstrom <gustav.erik@gmail.com>
Date: Wed, 25 Nov 2015 13:06:31 +0100
Subject: [PATCH] org-agenda: Filter empty tags
* lisp/org-agenda.el (org-agenda-filter-make-matcher-tag-exp): Deal with
the case when the user provided an empty string to filter or exclude
rows from the agenda.
This is done in order to fix a problem reported in emacs-orgmode
mailing list 2015-11-25 02:50 with subject "[O] [RFC] [PATCH] Changes
to Tag groups - allow nesting and regexps".
---
lisp/org-agenda.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 27ca20c..93c6bf8 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7636,10 +7636,12 @@ switches in the returned form."
(let (f f1) ;f = return expression. f1 = working-area
(dolist (x tags)
(let* ((tag (substring x 1))
- (isregexp (and (equal "{" (substring tag 0 1))
- (equal "}" (substring tag -1))))
+ (isregexp (and (string-prefix-p "{" tag)
+ (string-suffix-p "}" tag)))
regexp)
(cond
+ ((string= "" tag)
+ (setq f1 '(not tags)))
(isregexp
(setq regexp (substring tag 1 -1))
(setq f1 (list 'org-match-any-p regexp 'tags)))
--
1.9.5.msysgit.1
next prev parent reply other threads:[~2015-11-25 15:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 7:50 [RFC] [PATCH] Changes to Tag groups - allow nesting and regexps sgeorgii .
2015-11-25 10:26 ` Gustav Wikström
2015-11-25 11:05 ` sgeorgii .
2015-11-25 12:20 ` Gustav Wikström
2015-11-25 12:58 ` Nicolas Goaziou
2015-11-25 14:44 ` Gustav Wikström
2015-11-25 14:52 ` Nicolas Goaziou
2015-11-25 15:39 ` Gustav Wikström [this message]
2015-11-26 7:30 ` sgeorgii .
2015-11-26 8:21 ` Nicolas Goaziou
2015-11-26 10:01 ` Gustav Wikström
2015-11-26 10:21 ` Nicolas Goaziou
-- strict thread matches above, loose matches on Subject: below --
2015-01-25 11:07 Gustav Wikström
2015-01-31 8:41 ` Nicolas Goaziou
2015-02-19 20:00 ` Gustav Wikström
2015-02-24 16:43 ` Nicolas Goaziou
2015-03-05 1:08 ` Gustav Wikström
2015-03-07 21:51 ` Nicolas Goaziou
2015-03-15 10:17 ` Gustav Wikström
2015-03-16 20:38 ` Gustav Wikström
2015-03-16 21:30 ` Nicolas Goaziou
2015-03-19 21:07 ` Gustav Wikström
2015-03-19 22:43 ` Nicolas Goaziou
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=DB5PR02MB119119DB1715A7C3A4BF06BADA050@DB5PR02MB1191.eurprd02.prod.outlook.com \
--to=gustav@whil.se \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
--cc=sgeorgii@gmail.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).