forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
c8bb89faca
|
@ -16,6 +16,8 @@
|
|||
@set MAINTAINER Carsten Dominik
|
||||
@set MAINTAINEREMAIL @email{carsten at orgmode dot org}
|
||||
@set MAINTAINERCONTACT @uref{mailto:carsten at orgmode dot org,contact the maintainer}
|
||||
@documentencoding UTF-8
|
||||
@documentlanguage en
|
||||
@c %**end of header
|
||||
@finalout
|
||||
|
||||
|
|
|
@ -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."
|
||||
|
|
|
@ -43,7 +43,8 @@
|
|||
(defcustom org-babel-maxima-command
|
||||
(if (boundp 'maxima-command) maxima-command "maxima")
|
||||
"Command used to call maxima on the shell."
|
||||
:group 'org-babel)
|
||||
:group 'org-babel
|
||||
:type 'string)
|
||||
|
||||
(defun org-babel-maxima-expand (body params)
|
||||
"Expand a block of Maxima code according to its header arguments."
|
||||
|
|
|
@ -329,11 +329,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)
|
||||
|
@ -391,32 +391,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)
|
||||
|
@ -1358,12 +1358,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."
|
||||
|
@ -1806,7 +1806,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"))))
|
||||
|
||||
|
|
|
@ -103,7 +103,8 @@ the value of this variable."
|
|||
"Non-nil means display the first star of an inline task as additional marker.
|
||||
When nil, the first star is not shown."
|
||||
:tag "Org Inline Tasks"
|
||||
:group 'org-structure)
|
||||
:group 'org-structure
|
||||
:type 'boolean)
|
||||
|
||||
(defvar org-odd-levels-only)
|
||||
(defvar org-keyword-time-regexp)
|
||||
|
|
|
@ -815,7 +815,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
|
||||
|
@ -1886,7 +1886,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)))
|
||||
|
||||
|
@ -2572,7 +2572,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)))
|
||||
|
|
|
@ -289,7 +289,9 @@ When nil, no transformation is made."
|
|||
(const :tag "No formatting")))
|
||||
|
||||
(defcustom org-texinfo-def-table-markup "@samp"
|
||||
"Default setting for @table environments.")
|
||||
"Default setting for @table environments."
|
||||
:group 'org-export-texinfo
|
||||
:type 'string)
|
||||
|
||||
;;; Text markup
|
||||
|
||||
|
|
|
@ -368,7 +368,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
|
||||
|
|
Loading…
Reference in a new issue