From: Carsten Dominik <carsten.dominik@gmail.com>
To: Rodney Lorrimar <rodney@rodney.id.au>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] org-contacts: Fix org-contacts-gnus-article-from-goto
Date: Sat, 4 May 2013 18:49:14 +0200 [thread overview]
Message-ID: <DC25886C-ECFA-4D3E-987D-6F5691E26486@gmail.com> (raw)
In-Reply-To: <877gjezvis.fsf@rodney.id.au>
Applied, thanks.
- Carsten
On 4.5.2013, at 16:09, Rodney Lorrimar <rodney@rodney.id.au> wrote:
> * contrib/lisp/org-contacts.el (org-contacts-filter): Add a PROP-MATCH
> argument.
> (org-contacts-gnus-article-from-get-marker): Search for email as a
> property not a tag.
>
> `org-contacts-gnus-article-from-get-marker' seems to assume that the
> contact properties exist within the contact's tags as colon-separated
> KEY={VALUE} entries. This isn't the case for me, using org-mode from
> git master.
>
> This commit adds a PROP-MATCH argument to `org-contacts-filter' so
> that `org-contacts-gnus-article-from-get-marker` can filter by the
> EMAIL property.
> ---
> contrib/lisp/org-contacts.el | 19 +++++++++++++++----
> 1 file changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el
> index c72e6c0..c84f1f2 100644
> --- a/contrib/lisp/org-contacts.el
> +++ b/contrib/lisp/org-contacts.el
> @@ -233,10 +233,15 @@ A regexp matching strings of whitespace, `,' and `;'.")
> (progress-reporter-done progress-reporter)))
> org-contacts-db))
>
> -(defun org-contacts-filter (&optional name-match tags-match)
> - "Search for a contact matching NAME-MATCH and TAGS-MATCH.
> -If both match values are nil, return all contacts."
> +(defun org-contacts-filter (&optional name-match tags-match prop-match)
> + "Search for a contact matching any of NAME-MATCH, TAGS-MATCH, PROP-MATCH.
> +If all match values are nil, return all contacts.
> +
> +The optional PROP-MATCH argument is a single (PROP . VALUE) cons
> +cell corresponding to the contact properties.
> +"
> (if (and (null name-match)
> + (null prop-match)
> (null tags-match))
> (org-contacts-db)
> (loop for contact in (org-contacts-db)
> @@ -244,6 +249,11 @@ If both match values are nil, return all contacts."
> (and name-match
> (org-string-match-p name-match
> (first contact)))
> + (and prop-match
> + (org-find-if (lambda (prop)
> + (and (string= (car prop-match) (car prop))
> + (org-string-match-p (cdr prop-match) (cdr prop))))
> + (caddr contact)))
> (and tags-match
> (org-find-if (lambda (tag)
> (org-string-match-p tags-match tag))
> @@ -523,7 +533,8 @@ A group FOO is composed of contacts with the tag FOO."
> (email (cadr address)))
> (cadar (or (org-contacts-filter
> nil
> - (concat org-contacts-email-property "={\\b" (regexp-quote email) "\\b}"))
> + nil
> + (cons org-contacts-email-property (concat "\\b" (regexp-quote email) "\\b")))
> (when name
> (org-contacts-filter
> (concat "^" name "$")))))))
> --
> 1.7.10.4
>
prev parent reply other threads:[~2013-05-04 16:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-04 14:09 [PATCH] org-contacts: Fix org-contacts-gnus-article-from-goto Rodney Lorrimar
2013-05-04 16:49 ` Carsten Dominik [this message]
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=DC25886C-ECFA-4D3E-987D-6F5691E26486@gmail.com \
--to=carsten.dominik@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=rodney@rodney.id.au \
/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).