[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/org-contacts-rebased dcd313e 021/118: Tags/properties mat
From: |
Stefan Monnier |
Subject: |
[elpa] scratch/org-contacts-rebased dcd313e 021/118: Tags/properties matcher: Fixed issues with todo-only matches |
Date: |
Fri, 12 Nov 2021 15:36:56 -0500 (EST) |
branch: scratch/org-contacts-rebased
commit dcd313e66d2e2291485ca9eab8b719f36391fd9b
Author: Ilya Shlyakhter <ilya_shl@alum.mit.edu>
Commit: Bastien Guerry <bzg@altern.org>
Tags/properties matcher: Fixed issues with todo-only matches
lisp/org.el (org-scan-tags): Require todo-only argument, and document
that it should be the same one set by make-org-tags-matcher.
Fix documentation to explain that todo-only is really
not-done-todo-only.
(org-make-tags-matcher): If todo part of matcher starts with /!,
matcher now always checks that the TODO keyword is present and
is a not-done state. This matters e.g. for org-map-entries
which unlike org-scan-tags does not do its own separate todo-only
filtering. Added docs to explain matcher dependencies.
(org-map-entries): Make sure todo-only is correctly passed from
org-make-tags-matcher to org-scan-tags.
* lisp/org-clock.el: (org-clock-get-table-data): Make sure todo-only
does not leak when it is set by make-org-tags-macher.
* lisp/org-crypt.el: (org-encrypt-entries, org-decrypt-entries): Make
sure todo-only is correctly passed from org-make-tags-matcher to
org-scan-tags.
* contrib/lisp/contacts.el: (org-contacts-filter) : Make sure todo-only
is correctly passed from org-make-tags-matcher to org-scan-tags.
---
org-contacts.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/org-contacts.el b/org-contacts.el
index bdd9996..b6d9e50 100644
--- a/org-contacts.el
+++ b/org-contacts.el
@@ -143,7 +143,8 @@ This overrides `org-email-link-description-format' if set."
(defun org-contacts-filter (&optional name-match tags-match)
"Search for a contact maching NAME-MATCH and TAGS-MATCH.
If both match values are nil, return all contacts."
- (let ((tags-matcher
+ (let* (todo-only
+ (tags-matcher
(if tags-match
(cdr (org-make-tags-matcher tags-match))
t))
@@ -161,7 +162,8 @@ If both match values are nil, return all contacts."
(error "File %s is no in `org-mode'" file))
(org-scan-tags
'(add-to-list 'markers (set-marker (make-marker) (point)))
- `(and ,contacts-matcher ,tags-matcher ,name-matcher))))
+ `(and ,contacts-matcher ,tags-matcher ,name-matcher)
+ todo-only)))
(dolist (marker markers result)
(org-with-point-at marker
(add-to-list 'result
- [elpa] branch scratch/org-contacts-rebased created (now 3f635df), Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 6e66e4a 003/118: org-contacts: added custom org-contacts-birthday-format, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 4f5c581 006/118: Fix wanderlust interface for org-contact.el, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased b78a119 005/118: Add docstring for `wl-get-from-header-content'., Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 4a36f4a 004/118: Merge org-contacts-wl in org-contacts, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 4d5b508 007/118: org-contacts: check that completion-at-point-functions is bound, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased ad99d80 001/118: org-contacts: import, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased d0caf96 015/118: Replace org-mode-p with usual (eq major-mode 'org-mode) check, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 7fcd20b 025/118: contrib/lisp/org-contacts.el: Docstring fixes and small code clean up, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased dcd313e 021/118: Tags/properties matcher: Fixed issues with todo-only matches,
Stefan Monnier <=
- [elpa] scratch/org-contacts-rebased 938ca34 019/118: Add missing word to org-contacts y-or-n-p question, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased c0f4677 024/118: contrib/lisp/org-contacts.el: Require 'org-agenda., Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 6b235b4 044/118: contrib/lisp/*el: Fix license information and add "This file is not part...", Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 66e23e6 008/118: org-contacts: added VCard 3.0 exporter and ADDRESS field, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased e585be0 009/118: org-contacts: added org-contacts-show-map (requires google-maps-el), Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 6c12101 010/118: org-contacts: Use `with-current-buffer' instead of `save-excursion'+`with-current-buffer'., Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 7cae69f 011/118: org-contacts: Require cl on compilation., Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased ef5cb24 016/118: Copyright year fixes for contrib/., Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 5f1806a 012/118: org-contacts: fix errors when Gnus or ERC are not loaded, Stefan Monnier, 2021/11/12
- [elpa] scratch/org-contacts-rebased 531d67a 014/118: Fix Emacs 24 compatibility issue with Emacs 24, Stefan Monnier, 2021/11/12