[PATCH] org-agenda: allow to negate skip conditions

* [PATCH] org-agenda: allow to negate skip conditions
@ 2010-12-14 17:16 Julien Danjou
  2010-12-14 17:18 ` Julien Danjou
  0 siblings, 1 reply; 4+ messages in thread
From: Julien Danjou @ 2010-12-14 17:16 UTC (permalink / raw)
  To: emacs-orgmode; +Cc: Julien Danjou

* org-agenda.el (org-agenda-skip-if): Allow to negate conditions.

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 lisp/org-agenda.el |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index f476449..537a421 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4076,7 +4076,12 @@ See `org-agenda-skip-if' for details."
 See `org-agenda-skip-if' for details."
   (org-agenda-skip-if t conditions))
 
-(defun org-agenda-skip-if (subtree conditions)
+(defun org-agenda-skip-if-not (subtree conditions)
+  "Skip entry if none of CONDITIONS is false.
+See `org-agenda-skip-if' for details."
+  (org-agenda-skip-if subtree conditions t))
+
+(defun org-agenda-skip-if (subtree conditions &optional not)
   "Checks current entity for CONDITIONS.
 If SUBTREE is non-nil, the entire subtree is checked.  Otherwise, only
 the entry, i.e. the text before the next heading is checked.
@@ -4112,17 +4117,21 @@ Instead of a list a keyword class may be given
 would skip entries that haven't been marked with any of \"DONE\"
 keywords. Possible classes are: `todo', `done', `any'.
 
-If any of these conditions is met, this function returns the end point of
-the entity, causing the search to continue from there.  This is a function
-that can be put into `org-agenda-skip-function' for the duration of a command."
-  (let (beg end m)
-    (org-back-to-heading t)
-    (setq beg (point)
-	  end (if subtree
-		  (progn (org-end-of-subtree t) (point))
-		(progn (outline-next-heading) (1- (point)))))
-    (goto-char beg)
-    (and
+If any of these conditions is met, this function returns the end
+point of the entity, causing the search to continue from there.
+
+If NOT is set to t, then this function returns the end point of
+the entity only if none of the condition is met, causing the
+search to continue from there.
+
+This is a function that can be put into
+`org-agenda-skip-function' for the duration of a command."
+  (org-back-to-heading t)
+  (let ((beg (point))
+	(end (if subtree
+		 (save-excursion (org-end-of-subtree t))
+	       (save-excursion (outline-next-heading) (1- (point))))))
+    ((if not 'or 'and)
      (or
       (and (memq 'scheduled conditions)
 	   (re-search-forward org-scheduled-time-regexp end t))
-- 
1.7.2.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread