summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-03-05 16:34:16 +0100
committerBastien Guerry <bzg@altern.org>2013-03-05 16:38:33 +0100
commit8a2e3e2a79da8a88e0c084fc0c4922e90d03a3ca (patch)
treef8d6d440ae049b8d5ff57fb339170de053766576
parent7e6c632f807bc6e20255cadab6d16fc74a6a371f (diff)
downloadorg-mode-8a2e3e2a79da8a88e0c084fc0c4922e90d03a3ca.tar.gz
Add :version and :package-version
* ox.el (org-export-snippet-translation-alist) (org-export-coding-system, org-export-in-background) (org-export-async-init-file, org-export-invisible-backends) (org-export-dispatch-use-expert-ui): * ox-texinfo.el (org-texinfo-filename, org-texinfo-classes) (org-texinfo-format-headline-function) (org-texinfo-node-description-column) (org-texinfo-active-timestamp-format) (org-texinfo-link-with-unknown-path-format) (org-texinfo-tables-verbatim) (org-texinfo-table-scientific-notation) (org-texinfo-text-markup-alist) (org-texinfo-format-drawer-function) (org-texinfo-format-inlinetask-function) (org-texinfo-info-process): * ox-man.el (org-man-tables-centered) (org-man-table-scientific-notation) (org-man-source-highlight, org-man-source-highlight-langs) (org-man-pdf-process, org-man-logfiles-extensions): * ox-html.el (org-html-allow-name-attribute-in-anchors) (org-html-coding-system, org-html-divs): * ox-ascii.el (org-ascii-text-width) (org-ascii-headline-spacing, org-ascii-indented-line-width) (org-ascii-paragraph-spacing, org-ascii-charset) (org-ascii-underline, org-ascii-bullets) (org-ascii-links-to-notes) (org-ascii-table-keep-all-vertical-lines) (org-ascii-table-widen-columns) (org-ascii-table-use-ascii-art) (org-ascii-format-drawer-function) (org-ascii-format-inlinetask-function): * org.el (org-modules, org-export-backends) (org-highlight-latex-and-related, orgstruct-setup-hook): * org-attach.el (org-attach-git-annex-cutoff): * org-archive.el (org-archive-file-header-format): * org-agenda.el (org-agenda-todo-ignore-time-comparison-use-seconds): * ob-python.el (org-babel-python-hline-to) (org-babel-python-None-to): * ob-ditaa.el (org-ditaa-eps-jar-path): * ob-core.el (org-babel-results-keyword): Add :version and :package-version. * ox-ascii.el: Use utf-8-emacs as the file coding system.
-rw-r--r--lisp/ob-core.el2
-rw-r--r--lisp/ob-ditaa.el2
-rw-r--r--lisp/ob-python.el4
-rw-r--r--lisp/org-agenda.el4
-rw-r--r--lisp/org-archive.el2
-rw-r--r--lisp/org-attach.el2
-rw-r--r--lisp/org.el8
-rw-r--r--lisp/ox-ascii.el43
-rw-r--r--lisp/ox-html.el6
-rw-r--r--lisp/ox-man.el17
-rw-r--r--lisp/ox-texinfo.el30
-rw-r--r--lisp/ox.el12
12 files changed, 130 insertions, 2 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 80601ea..3b7c463 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -135,6 +135,8 @@ remove code block execution from the C-c C-c keybinding."
Should be either RESULTS or NAME however any capitalization may
be used."
:group 'org-babel
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defcustom org-babel-noweb-wrap-start "<<"
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 5ef519c..d3d76e5 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -62,6 +62,8 @@
(expand-file-name "DitaaEps.jar" (file-name-directory org-ditaa-jar-path))
"Path to the DitaaEps.jar executable."
:group 'org-babel
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defcustom org-ditaa-jar-option "-jar"
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index c5f925e..7bc9a1f 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -61,11 +61,15 @@ This will typically be either 'python or 'python-mode."
(defcustom org-babel-python-hline-to "None"
"Replace hlines in incoming tables with this when translating to python."
:group 'org-babel
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defcustom org-babel-python-None-to 'hline
"Replace 'None' in python tables with this before returning."
:group 'org-babel
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defun org-babel-execute:python (body params)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index c2fc14a..283a869 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -750,12 +750,14 @@ Non-nil means to compare time stamps using seconds. An item is then
considered future if it has a time value later than current time."
:group 'org-agenda-skip
:group 'org-agenda-todo-list
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(const :tag "Compare time with days" nil)
(const :tag "Compare time with seconds" t)))
(defcustom org-agenda-tags-todo-honor-ignore-options nil
- "Non-nil means honor todo-list ...ignore options also in tags-todo search.
+ "Non-nil means honor todo-list ignores options also in tags-todo search.
The variables
`org-agenda-todo-ignore-with-date',
`org-agenda-todo-ignore-timestamp',
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 09564d9..d5bdff1 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -76,6 +76,8 @@ This variable is obsolete and has no effect anymore, instead add or remove
When nil, no header will be inserted.
When a string, a %s formatter will be replaced by the file name."
:group 'org-archive
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defcustom org-archive-subtree-add-inherited-tags 'infile
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 51a8995..faefa6b 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -57,6 +57,8 @@ where the Org file lives."
(defcustom org-attach-git-annex-cutoff (* 32 1024)
"If non-nil, files larger than this will be annexed instead of stored."
:group 'org-attach
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(const :tag "None" nil)
(integer :tag "Bytes")))
diff --git a/lisp/org.el b/lisp/org.el
index 588821a..a42b6b0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -347,6 +347,8 @@ to add the symbol `xyz', and the package must have a call to:
For export specific modules, see also `org-export-backends'."
:group 'org
:set 'org-set-modules
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type
'(set :greedy t
(const :tag " bbdb: Links to BBDB entries" org-bbdb)
@@ -452,6 +454,8 @@ Adding a back-end to this list will also pull the back-end it
depends on, if any."
:group 'org
:group 'org-export
+ :version "24.4"
+ :package-version '(Org . "8.0")
:set (lambda (var val)
(if (not (featurep 'ox)) (set-default var val)
;; Any back-end not required anymore (not present in VAL and not
@@ -3915,6 +3919,8 @@ following symbols:
`script' Highlight subscript and superscript.
`entities' Highlight entities."
:group 'org-appearance
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(const :tag "No highlighting" nil)
(set :greedy t :tag "Highlight"
@@ -8654,6 +8660,8 @@ orgstruct(++)-mode."
(defcustom orgstruct-setup-hook nil
"Hook run after orgstruct-mode-map is filled."
:group 'org
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'hook)
(defvar orgstruct-initialized nil)
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 078035e..76da33a 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -146,29 +146,39 @@
This number includes margin size, as set in
`org-ascii-global-margin'."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'integer)
(defcustom org-ascii-global-margin 0
"Width of the left margin, in number of characters."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'integer)
(defcustom org-ascii-inner-margin 2
"Width of the inner margin, in number of characters.
Inner margin is applied between each headline."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'integer)
(defcustom org-ascii-quote-margin 6
"Width of margin used for quoting text, in characters.
This margin is applied on both sides of the text."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'integer)
(defcustom org-ascii-inlinetask-width 30
"Width of inline tasks, in number of characters.
This number ignores any margin."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'integer)
(defcustom org-ascii-headline-spacing '(1 . 2)
@@ -182,6 +192,8 @@ contents.
A nil value replicates the number of blank lines found in the
original Org buffer at the same place."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(const :tag "Replicate original spacing" nil)
(cons :tag "Set an uniform spacing"
@@ -194,6 +206,8 @@ If the value is an integer, indent the first line of each
paragraph by this number. If it is the symbol `auto' preserve
indentation from original document."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(integer :tag "Number of white spaces characters")
(const :tag "Preserve original width" auto)))
@@ -204,6 +218,8 @@ If the value is an integer, add this number of blank lines
between contiguous paragraphs. If is it the symbol `auto', keep
the same number of blank lines as in the original document."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(integer :tag "Number of blank lines")
(const :tag "Preserve original spacing" auto)))
@@ -215,6 +231,8 @@ Possible values are:
`latin1' Include Latin-1 characters
`utf-8' Use all UTF-8 characters"
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(const :tag "ASCII" ascii)
(const :tag "Latin-1" latin1)
@@ -233,6 +251,8 @@ of underline characters. In a sequence, the characters will be
used in order for headlines level 1, 2, ... If no character is
available for a given level, the headline won't be underlined."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(list
(cons :tag "Underline characters sequence"
(const :tag "ASCII charset" ascii)
@@ -259,6 +279,8 @@ here, the list will be repeated.
Note that this variable doesn't affect plain lists
representation."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(list
(cons :tag "Bullet characters for low level headlines"
(const :tag "ASCII charset" ascii)
@@ -275,6 +297,8 @@ representation."
When nil, the link will be exported in place. If the line
becomes long in this way, it will be wrapped."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
(defcustom org-ascii-table-keep-all-vertical-lines nil
@@ -282,6 +306,8 @@ becomes long in this way, it will be wrapped."
When nil, vertical lines will be removed except for those needed
for column grouping."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
(defcustom org-ascii-table-widen-columns t
@@ -289,6 +315,8 @@ for column grouping."
When nil, narrowed columns will look in ASCII export just like in
Org mode, i.e. with \"=>\" as ellipsis."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
(defcustom org-ascii-table-use-ascii-art nil
@@ -298,17 +326,25 @@ It only makes sense when export charset is `utf-8'. It is nil by
default since it requires ascii-art-to-unicode.el package. You
can download it here:
- http://gnuvola.org/software/j/aa2u/ascii-art-to-unicode.el.")
+ http://gnuvola.org/software/j/aa2u/ascii-art-to-unicode.el."
+ :group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
+ :type 'boolean)
(defcustom org-ascii-caption-above nil
"When non-nil, place caption string before the element.
Otherwise, place it right after it."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
(defcustom org-ascii-verbatim-format "`%s'"
"Format string used for verbatim text and inline code."
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defcustom org-ascii-format-drawer-function nil
@@ -329,6 +365,8 @@ in order to mimic default behaviour:
\"Format a drawer element for ASCII export.\"
contents)"
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'function)
(defcustom org-ascii-format-inlinetask-function nil
@@ -375,6 +413,8 @@ in order to mimic default behaviour:
\(plist-get info :ascii-inner-margin\)
\(org-ascii--current-text-width inlinetask info\)\)"
:group 'org-export-ascii
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'function)
@@ -1950,6 +1990,7 @@ Return output file name."
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
+;; coding: utf-8-emacs
;; End:
;;; ox-ascii.el ends here
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 5ad5ee1..fe9702d 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -578,6 +578,8 @@ The function result will be used in the section format string."
By default, anchors are formatted with both \"id\" and \"name\"
attributes, when appropriate."
:group 'org-export-html
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
@@ -828,6 +830,8 @@ and corresponding declarations."
"Coding system for HTML export.
Use utf-8 as the default value."
:group 'org-export-html
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'coding-system)
(defcustom org-html-divs '("preamble" "content" "postamble")
@@ -836,6 +840,8 @@ This is a list of three strings, the first one for the preamble
DIV, the second one for the content DIV and the third one for the
postamble DIV."
:group 'org-export-html
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(list
(string :tag " Div for the preamble:")
(string :tag " Div for the content:")
diff --git a/lisp/ox-man.el b/lisp/ox-man.el
index cca1899..4c17e49 100644
--- a/lisp/ox-man.el
+++ b/lisp/ox-man.el
@@ -128,11 +128,15 @@
(defcustom org-man-tables-centered t
"When non-nil, tables are exported in a center environment."
:group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
(defcustom org-man-tables-verbatim nil
"When non-nil, tables are exported verbatim."
:group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
@@ -143,6 +147,8 @@ The format should have \"%s\" twice, for mantissa and exponent
When nil, no transformation is made."
:group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(string :tag "Format string")
(const :tag "No formatting")))
@@ -154,6 +160,8 @@ When nil, no transformation is made."
(defcustom org-man-source-highlight nil
"Use GNU source highlight to embellish source blocks "
:group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
@@ -183,6 +191,8 @@ parameter for the listings package. If the mode name and the
listings name are the same, the language does not need an entry
in this list - but it does not hurt if it is present."
:group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(repeat
(list
(symbol :tag "Major mode ")
@@ -224,6 +234,9 @@ Alternatively, this may be a Lisp function that does the
processing. This function should accept the file name as
its single argument."
:group 'org-export-pdf
+ :group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(repeat :tag "Shell command sequence"
(string :tag "Shell command"))
@@ -240,12 +253,16 @@ its single argument."
'("log" "out" "toc")
"The list of file extensions to consider as Man logfiles."
:group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(repeat (string :tag "Extension")))
(defcustom org-man-remove-logfiles t
"Non-nil means remove the logfiles produced by PDF production.
These are the .aux, .log, .out, and .toc files."
:group 'org-export-man
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 9400b82..84de446 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -144,11 +144,15 @@
(defcustom org-texinfo-filename nil
"Default filename for texinfo output."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(string :tag "Export Filename"))
(defcustom org-texinfo-default-class "info"
"The default Texinfo class."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(string :tag "Texinfo class"))
(defcustom org-texinfo-classes
@@ -181,6 +185,8 @@ parameters, the \(reduced) level of the headline, and a predicate
non-nil when the headline should be numbered. It must return
a format string in which the section title will be added."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(repeat
(list (string :tag "Texinfo class")
(string :tag "Texinfo header")
@@ -219,6 +225,8 @@ order to reproduce the default set-up:
\(format \"\\\\hfill{}\\\\textsc{%s}\"
\(mapconcat 'identity tags \":\"))))"
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'function)
;;; Node listing (menu)
@@ -230,6 +238,8 @@ order to reproduce the default set-up:
If a node title is greater than this length, the description will
be placed after the end of the title."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'integer)
;;; Footnotes
@@ -241,16 +251,22 @@ be placed after the end of the title."
(defcustom org-texinfo-active-timestamp-format "@emph{%s}"
"A printf format string to be applied to active timestamps."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defcustom org-texinfo-inactive-timestamp-format "@emph{%s}"
"A printf format string to be applied to inactive timestamps."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
(defcustom org-texinfo-diary-timestamp-format "@emph{%s}"
"A printf format string to be applied to diary timestamps."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
;;; Links
@@ -258,6 +274,8 @@ be placed after the end of the title."
(defcustom org-texinfo-link-with-unknown-path-format "@indicateurl{%s}"
"Format string for links with unknown path type."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'string)
;;; Tables
@@ -265,6 +283,8 @@ be placed after the end of the title."
(defcustom org-texinfo-tables-verbatim nil
"When non-nil, tables are exported verbatim."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
(defcustom org-texinfo-table-scientific-notation "%s\\,(%s)"
@@ -274,6 +294,8 @@ The format should have \"%s\" twice, for mantissa and exponent
When nil, no transformation is made."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(choice
(string :tag "Format string")
(const :tag "No formatting")))
@@ -302,6 +324,8 @@ to typeset and try to protect special characters.
If no association can be found for a given markup, text will be
returned as-is."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'alist
:options '(bold code italic verbatim comment))
@@ -323,6 +347,8 @@ in order to mimic default behaviour:
\"Format a drawer element for Texinfo export.\"
contents\)"
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'function)
;;; Inlinetasks
@@ -359,6 +385,8 @@ in order to mimic default behaviour:
\"\n\"))
full-title contents))"
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'function)
;;; Src blocks
@@ -375,6 +403,8 @@ as a command. %f in the command will be replaced by the full
file name, %b by the file base name \(i.e without extension) and
%o by the base directory of the file."
:group 'org-export-texinfo
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(repeat :tag "Shell command sequence"
(string :tag "Shell command")))
diff --git a/lisp/ox.el b/lisp/ox.el
index d60895a..3a0764d 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -721,6 +721,8 @@ For example, with a value of '\(\(\"h\" . \"html\"\)\), the
HTML back-end will recognize the contents of \"@@h:<b>@@\" as
HTML code while every other back-end will ignore it."
:group 'org-export-general
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(repeat
(cons (string :tag "Shortcut")
(string :tag "Back-end"))))
@@ -728,6 +730,8 @@ HTML code while every other back-end will ignore it."
(defcustom org-export-coding-system nil
"Coding system for the exported file."
:group 'org-export-general
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'coding-system)
(defcustom org-export-copy-to-kill-ring t
@@ -758,6 +762,8 @@ these cases."
Results from an asynchronous export are never displayed
automatically. But you can retrieve them with \\[org-export-stack]."
:group 'org-export-general
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)
(defcustom org-export-async-init-file user-init-file
@@ -766,6 +772,8 @@ Value must be an absolute file name. It defaults to user's
initialization file. Though, a specific configuration makes the
process faster and the export more portable."
:group 'org-export-general
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(file :must-match t))
(defcustom org-export-invisible-backends nil
@@ -778,6 +786,8 @@ Indeed, Org may require some export back-ends without notice. If
these modules are never to be used interactively, adding them
here will avoid cluttering the dispatcher menu."
:group 'org-export-general
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type '(repeat (symbol :tag "Back-End")))
(defcustom org-export-dispatch-use-expert-ui nil
@@ -791,6 +801,8 @@ passed the FORCE argument and \"a\" when the export should be
asynchronous). Also, \[?] allows to switch back to standard
mode."
:group 'org-export-general
+ :version "24.4"
+ :package-version '(Org . "8.0")
:type 'boolean)