summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-14 00:40:58 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-14 00:40:58 +0100
commit60831c4606d03dca32d8151bd6e484128317d39d (patch)
treec0a820860344d6be357a1cd0fabef7a7663e1753
parentbbf39576f4818c168e533a5dbace1601edee710b (diff)
parent263a0cf00ed528a835003293c1ff810f140ffd86 (diff)
downloadorg-mode-60831c4606d03dca32d8151bd6e484128317d39d.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el32
-rw-r--r--lisp/org-duration.el4
-rw-r--r--lisp/org.el2
3 files changed, 19 insertions, 19 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index c882283..8f64596 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -395,35 +395,35 @@ the daily/weekly agenda, see `org-agenda-skip-function'.")
(choice
:tag "Condition type"
(list :tag "Regexp matches" :inline t
- (const :format "" 'regexp)
+ (const :format "" regexp)
(regexp))
(list :tag "Regexp does not match" :inline t
- (const :format "" 'notregexp)
+ (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)
diff --git a/lisp/org-duration.el b/lisp/org-duration.el
index 096e973..f98c600 100644
--- a/lisp/org-duration.el
+++ b/lisp/org-duration.el
@@ -99,8 +99,8 @@ sure to call the following command:
:set (lambda (var val) (set-default var val) (org-duration-set-regexps))
:initialize 'custom-initialize-changed
:type '(choice
- (const :tag "H:MM" 'h:mm)
- (const :tag "H:MM:SS" 'h:mm:ss)
+ (const :tag "H:MM" h:mm)
+ (const :tag "H:MM:SS" h:mm:ss)
(alist :key-type (string :tag "Unit")
:value-type (number :tag "Modifier"))))
diff --git a/lisp/org.el b/lisp/org.el
index 0053994..7f40ad6 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1688,7 +1688,7 @@ doesn't specify any upper case character."
:type '(choice
(const :tag "Case-sensitive" nil)
(const :tag "Case-insensitive" t)
- (const :tag "Case-insensitive for lower case searches only" 'smart)))
+ (const :tag "Case-insensitive for lower case searches only" smart)))
(defcustom org-occur-hook '(org-first-headline-recenter)
"Hook that is run after `org-occur' has constructed a sparse tree.