diff options
author | Bastien Guerry <bzg@altern.org> | 2014-06-02 20:00:20 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-06-02 20:00:20 +0200 |
commit | 3969268e2aa5f47e555e4d1e0bd34134d5e2ad49 (patch) | |
tree | 7e7a9314f6d7f842ba69e9fb876922ea1751964f | |
parent | 3518403790f2f22779e50728234b2da5f1e84ce0 (diff) | |
parent | 6f64027feed333214d78b02aa79fcfe213044fe1 (diff) | |
download | org-mode-3969268e2aa5f47e555e4d1e0bd34134d5e2ad49.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index bf8287f..5e056b4 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -397,32 +397,36 @@ the daily/weekly agenda, see `org-agenda-skip-function'.") (repeat :inline t :tag "Conditions for skipping" (choice :tag "Condition type" - (list :tag "Regexp matches" :inline t (const :format "" regexp) (regexp)) - (list :tag "Regexp does not match" :inline t (const :format "" notregexp) (regexp)) + (list :tag "Regexp matches" :inline t + (const :format "" 'regexp) + (regexp)) + (list :tag "Regexp does not match" :inline t + (const :format "" 'notregexp) + (regexp)) (list :tag "TODO state is" :inline t - (const todo) + (const 'todo) (choice - (const :tag "any not-done state" todo) - (const :tag "any done state" done) - (const :tag "any state" any) + (const :tag "Any not-done state" 'todo) + (const :tag "Any done state" 'done) + (const :tag "Any state" 'any) (list :tag "Keyword list" (const :format "" quote) (repeat (string :tag "Keyword"))))) (list :tag "TODO state is not" :inline t - (const nottodo) + (const 'nottodo) (choice - (const :tag "any not-done state" todo) - (const :tag "any done state" done) - (const :tag "any state" any) + (const :tag "Any not-done state" 'todo) + (const :tag "Any done state" 'done) + (const :tag "Any state" 'any) (list :tag "Keyword list" (const :format "" quote) (repeat (string :tag "Keyword"))))) - (const :tag "scheduled" scheduled) - (const :tag "not scheduled" notscheduled) - (const :tag "deadline" deadline) - (const :tag "no deadline" notdeadline) - (const :tag "timestamp" timestamp) - (const :tag "no timestamp" nottimestamp)))))) + (const :tag "scheduled" 'scheduled) + (const :tag "not scheduled" 'notscheduled) + (const :tag "deadline" 'deadline) + (const :tag "no deadline" 'notdeadline) + (const :tag "timestamp" 'timestamp) + (const :tag "no timestamp" 'nottimestamp)))))) (list :tag "Non-standard skipping condition" :value (org-agenda-skip-function) (const org-agenda-skip-function) |