ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-06-02 20:00:20 +02:00
parent 3518403790 6f64027fee
commit 3969268e2a
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lisp/org-agenda.el
View File

@ -397,32 +397,36 @@ the daily/weekly agenda, see `org-agenda-skip-function'.")
(repeat :inline t :tag "Conditions for skipping" (repeat :inline t :tag "Conditions for skipping"
(choice (choice
:tag "Condition type" :tag "Condition type"
(list :tag "Regexp matches" :inline t (const :format "" regexp) (regexp)) (list :tag "Regexp matches" :inline t
(list :tag "Regexp does not match" :inline t (const :format "" notregexp) (regexp)) (const :format "" 'regexp)
(regexp))
(list :tag "Regexp does not match" :inline t
(const :format "" 'notregexp)
(regexp))
(list :tag "TODO state is" :inline t (list :tag "TODO state is" :inline t
(const todo) (const 'todo)
(choice (choice
(const :tag "any not-done state" todo) (const :tag "Any not-done state" 'todo)
(const :tag "any done state" done) (const :tag "Any done state" 'done)
(const :tag "any state" any) (const :tag "Any state" 'any)
(list :tag "Keyword list" (list :tag "Keyword list"
(const :format "" quote) (const :format "" quote)
(repeat (string :tag "Keyword"))))) (repeat (string :tag "Keyword")))))
(list :tag "TODO state is not" :inline t (list :tag "TODO state is not" :inline t
(const nottodo) (const 'nottodo)
(choice (choice
(const :tag "any not-done state" todo) (const :tag "Any not-done state" 'todo)
(const :tag "any done state" done) (const :tag "Any done state" 'done)
(const :tag "any state" any) (const :tag "Any state" 'any)
(list :tag "Keyword list" (list :tag "Keyword list"
(const :format "" quote) (const :format "" quote)
(repeat (string :tag "Keyword"))))) (repeat (string :tag "Keyword")))))
(const :tag "scheduled" scheduled) (const :tag "scheduled" 'scheduled)
(const :tag "not scheduled" notscheduled) (const :tag "not scheduled" 'notscheduled)
(const :tag "deadline" deadline) (const :tag "deadline" 'deadline)
(const :tag "no deadline" notdeadline) (const :tag "no deadline" 'notdeadline)
(const :tag "timestamp" timestamp) (const :tag "timestamp" 'timestamp)
(const :tag "no timestamp" nottimestamp)))))) (const :tag "no timestamp" 'nottimestamp))))))
(list :tag "Non-standard skipping condition" (list :tag "Non-standard skipping condition"
:value (org-agenda-skip-function) :value (org-agenda-skip-function)
(const org-agenda-skip-function) (const org-agenda-skip-function)