summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-12-30 10:30:44 +0100
committerBastien Guerry <bzg@altern.org>2013-12-30 10:30:44 +0100
commit8bb519d9346668b34a3b407fc76204b180588fc6 (patch)
tree0a2da087c3dd1f778569d19626a174bc66244e39
parent9d3e48f6299b2a7b366bcf19813ab512c545b30f (diff)
downloadorg-mode-8bb519d9346668b34a3b407fc76204b180588fc6.tar.gz
Fix defcustoms: don't quote const values.
* ob-latex.el (org-babel-latex-htlatex-packages): Use repeat instead of list as the defcustom type. * ox.el (org-export-with-creator): * org.el (org-loop-over-headlines-in-active-region) (org-mouse-1-follows-link, org-provide-todo-statistics): * org-agenda.el (org-agenda-custom-commands-local-options) (org-agenda-start-with-log-mode) (org-agenda-show-inherited-tags): Don't quote const values. Thanks to Glenn Morris for reporting this.
-rw-r--r--lisp/ob-latex.el2
-rw-r--r--lisp/org-agenda.el54
-rw-r--r--lisp/org.el6
-rw-r--r--lisp/ox.el2
4 files changed, 32 insertions, 32 deletions
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 85918e6..cb8ae54 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -59,7 +59,7 @@
'("[usenames]{color}" "{tikz}" "{color}" "{listings}" "{amsmath}")
"Packages to use for htlatex export."
:group 'org-babel
- :type '(list (string)))
+ :type '(repeat (string)))
(defun org-babel-expand-body:latex (body params)
"Expand BODY according to PARAMS, return the expanded body."
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 4dfa3e9..1765968 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -328,11 +328,11 @@ the daily/weekly agenda, see `org-agenda-skip-function'.")
(string))
(list :tag "Number of days in agenda"
(const org-agenda-span)
- (choice (const :tag "Day" 'day)
- (const :tag "Week" 'week)
- (const :tag "Fortnight" 'fortnight)
- (const :tag "Month" 'month)
- (const :tag "Year" 'year)
+ (choice (const :tag "Day" day)
+ (const :tag "Week" week)
+ (const :tag "Fortnight" fortnight)
+ (const :tag "Month" month)
+ (const :tag "Year" year)
(integer :tag "Custom")))
(list :tag "Fixed starting date"
(const org-agenda-start-day)
@@ -390,32 +390,32 @@ 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)
@@ -1357,12 +1357,12 @@ explanations on the possible values."
:group 'org-agenda-startup
:group 'org-agenda-daily/weekly
:type '(choice (const :tag "Don't show log items" nil)
- (const :tag "Show only log items" 'only)
- (const :tag "Show all possible log items" 'clockcheck)
+ (const :tag "Show only log items" only)
+ (const :tag "Show all possible log items" clockcheck)
(repeat :tag "Choose among possible values for `org-agenda-log-mode-items'"
- (choice (const :tag "Show closed log items" 'closed)
- (const :tag "Show clocked log items" 'clock)
- (const :tag "Show all logged state changes" 'state)))))
+ (choice (const :tag "Show closed log items" closed)
+ (const :tag "Show clocked log items" clock)
+ (const :tag "Show all logged state changes" state)))))
(defcustom org-agenda-start-with-clockreport-mode nil
"The initial value of clockreport-mode in a newly created agenda window."
@@ -1805,7 +1805,7 @@ When set to nil, never show inherited tags in agenda lines."
:version "24.3"
:type '(choice
(const :tag "Show inherited tags when available" t)
- (const :tag "Always show inherited tags" 'always)
+ (const :tag "Always show inherited tags" always)
(repeat :tag "Show inherited tags only in selected agenda types"
(symbol :tag "Agenda type"))))
diff --git a/lisp/org.el b/lisp/org.el
index 0f96589..1393755 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -602,7 +602,7 @@ The list of commands is: `org-schedule', `org-deadline',
already archived entries."
:type '(choice (const :tag "Don't loop" nil)
(const :tag "All headlines in active region" t)
- (const :tag "In active region, headlines at the same level than the first one" 'start-level)
+ (const :tag "In active region, headlines at the same level than the first one" start-level)
(string :tag "Tags/Property/Todo matcher"))
:version "24.1"
:group 'org-todo
@@ -1741,7 +1741,7 @@ Needs to be set before org.el is loaded."
:version "24.4"
:package-version '(Org . "8.3")
:type '(choice
- (const :tag "A double click follows the link" 'double)
+ (const :tag "A double click follows the link" double)
(const :tag "Unconditionally follow the link with mouse-1" t)
(integer :tag "mouse-1 click does not follow the link if longer than N ms" 450)))
@@ -2428,7 +2428,7 @@ current entry each time a todo state is changed."
:group 'org-todo
:type '(choice
(const :tag "Yes, only for TODO entries" t)
- (const :tag "Yes, including all entries" 'all-headlines)
+ (const :tag "Yes, including all entries" all-headlines)
(repeat :tag "Yes, for TODOs in this list"
(string :tag "TODO keyword"))
(other :tag "No TODO statistics" nil)))
diff --git a/lisp/ox.el b/lisp/ox.el
index 2310327..08aafc8 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -362,7 +362,7 @@ If the value is `comment' insert it as a comment."
:group 'org-export-general
:type '(choice
(const :tag "No creator sentence" nil)
- (const :tag "Sentence as a comment" 'comment)
+ (const :tag "Sentence as a comment" comment)
(const :tag "Insert the sentence" t)))
(defcustom org-export-with-date t