From 9b408937093cd0bb091504775f812adba96b1001 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:08:32 +0200 Subject: [PATCH 01/37] Add :version to org-beamer.el options. --- lisp/org-beamer.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el index eee1af4dd..041a91540 100644 --- a/lisp/org-beamer.el +++ b/lisp/org-beamer.el @@ -43,6 +43,7 @@ (defcustom org-beamer-use-parts nil "" :group 'org-beamer + :version "24.1" :type 'boolean) (defcustom org-beamer-frame-level 1 @@ -52,6 +53,7 @@ Setting this to 2 will allow sections, 3 will allow subsections as well. You can set this to 4 as well, if you at the same time set `org-beamer-use-parts' to make the top levels `\part'." :group 'org-beamer + :version "24.1" :type '(choice (const :tag "Frames need a BEAMER_env property" nil) (integer :tag "Specific level makes a frame"))) @@ -60,12 +62,14 @@ You can set this to 4 as well, if you at the same time set "Default options string to use for frames, should contains the [brackets]. And example for this is \"[allowframebreaks]\"." :group 'org-beamer + :version "24.1" :type '(string :tag "[options]")) (defcustom org-beamer-column-view-format "%45ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra)" "Default column view format that should be used to fill the template." :group 'org-beamer + :version "24.1" :type '(choice (const :tag "Do not insert Beamer column view format" nil) (string :tag "Beamer column view format"))) @@ -76,6 +80,7 @@ And example for this is \"[allowframebreaks]\"." When a beamer template is filled, this will be the default for BEAMER_HEADER_EXTRA, which will be inserted just before \\begin{document}." :group 'org-beamer + :version "24.1" :type '(choice (const :tag "Do not insert Beamer themes" nil) (string :tag "Beamer themes"))) @@ -142,6 +147,7 @@ open The opening template for the environment, with the following escapes close The closing string of the environment." :group 'org-beamer + :version "24.1" :type '(repeat (list (string :tag "Environment") @@ -402,6 +408,7 @@ the value will be inserted right after the documentclass statement." (defcustom org-beamer-fragile-re "\\\\\\(verb\\|lstinline\\)\\|^[ \t]*\\\\begin{\\(verbatim\\|lstlisting\\|minted\\)}" "If this regexp matches in a frame, the frame is marked as fragile." :group 'org-beamer + :version "24.1" :type 'regexp) (defface org-beamer-tag '((t (:box (:line-width 1 :color grey40)))) @@ -511,6 +518,7 @@ This function will run in the final LaTeX document." (defcustom org-beamer-outline-frame-title "Outline" "Default title of a frame containing an outline." :group 'org-beamer + :version "24.1" :type '(string :tag "Outline frame title") ) @@ -519,6 +527,7 @@ This function will run in the final LaTeX document." You might want to put e.g. [allowframebreaks=0.9] here. Remember to include square brackets." :group 'org-beamer + :version "24.1" :type '(string :tag "Outline frame options") ) From b2500c21b178c71182d89da1caed6c5484c86a0a Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:09:15 +0200 Subject: [PATCH 02/37] Add :version to org-freemind.el option. --- lisp/org-freemind.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el index 8b7740072..3b94d9289 100644 --- a/lisp/org-freemind.el +++ b/lisp/org-freemind.el @@ -414,6 +414,7 @@ MATCHED is the link just matched." ;; with this setting now, but not before??? Was this perhaps a java ;; bug or is it a windows xp bug (some resource gets exhausted if you ;; use sticky keys which I do). + :version "24.1" :group 'org-freemind) (defun org-freemind-org-text-to-freemind-subnode/note (node-name start end drawers-regexp) From d5579cb43152171d2137fe7a65df396bf7415b0d Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:10:55 +0200 Subject: [PATCH 03/37] Add :version to org-publish.el options. --- lisp/org-publish.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 67540a676..74cab1471 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -248,6 +248,7 @@ nil won't sort files. You can overwrite this default per project in your `org-publish-project-alist', using `:sitemap-sort-files'." :group 'org-publish + :version "24.1" :type 'symbol) (defcustom org-publish-sitemap-sort-folders 'first @@ -260,6 +261,7 @@ Any other value will not mix files and folders. You can overwrite this default per project in your `org-publish-project-alist', using `:sitemap-sort-folders'." :group 'org-publish + :version "24.1" :type 'symbol) (defcustom org-publish-sitemap-sort-ignore-case nil @@ -268,12 +270,14 @@ You can overwrite this default per project in your You can overwrite this default per project in your `org-publish-project-alist', using `:sitemap-ignore-case'." :group 'org-publish + :version "24.1" :type 'boolean) (defcustom org-publish-sitemap-date-format "%Y-%m-%d" "Format for `format-time-string' which is used to print a date in the sitemap." :group 'org-publish + :version "24.1" :type 'string) (defcustom org-publish-sitemap-file-entry-format "%t" @@ -284,6 +288,7 @@ You could use brackets to delimit on what part the link will be. %a is the author. %d is the date formatted using `org-publish-sitemap-date-format'." :group 'org-publish + :version "24.1" :type 'string) From a7076d693dc741f5aaad64d389422a36babedafb Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:11:32 +0200 Subject: [PATCH 04/37] Add :version to ob-lob.el option. --- lisp/ob-lob.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el index d5595bbf5..7828f1d51 100644 --- a/lisp/ob-lob.el +++ b/lisp/ob-lob.el @@ -39,6 +39,7 @@ files to `org-babel-lob-files'.") "Files used to populate the `org-babel-library-of-babel'. To add files to this list use the `org-babel-lob-ingest' command." :group 'org-babel + :version "24.1" :type 'list) (defvar org-babel-default-lob-header-args '((:exports . "results")) From f117fcb98b91001fd6e5e04ab2a125da6669349d Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:12:47 +0200 Subject: [PATCH 05/37] Add :version to org-mobile.el options. --- lisp/org-mobile.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el index bcc1c9093..3bd9a7c0b 100644 --- a/lisp/org-mobile.el +++ b/lisp/org-mobile.el @@ -68,6 +68,7 @@ org-agenda-text-search-extra-files (defcustom org-mobile-files-exclude-regexp "" "A regexp to exclude files from `org-mobile-files'." :group 'org-mobile + :version "24.1" :type 'regexp) (defcustom org-mobile-directory "" @@ -84,6 +85,7 @@ Turning on encryption requires to set the same password in the MobileOrg application. Before turning this on, check of MobileOrg does already support it - at the time of this writing it did not yet." :group 'org-mobile + :version "24.1" :type 'boolean) (defcustom org-mobile-encryption-tempfile "~/orgtmpcrypt" @@ -91,6 +93,7 @@ support it - at the time of this writing it did not yet." This must be local file on your local machine (not on the WebDAV server). You might want to put this file into a directory where only you have access." :group 'org-mobile + :version "24.1" :type 'directory) (defcustom org-mobile-encryption-password "" @@ -111,6 +114,7 @@ it, this also limits the security of this approach. You can also leave this variable empty - Org will then ask for the password once per Emacs session." :group 'org-mobile + :version "24.1" :type '(string :tag "Password")) (defvar org-mobile-encryption-password-session nil) @@ -150,6 +154,7 @@ custom all custom agendas defined by the user all the custom agendas and the default ones list a list of selection key(s) as string." :group 'org-mobile + :version "24.1" :type '(choice (const :tag "Default Agendas" default) (const :tag "Custom Agendas" custom) From 1755b53625a86215bb80d498ada68d1a228cbf87 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:14:06 +0200 Subject: [PATCH 06/37] Add :version to ob-tangle.el options. --- lisp/ob-tangle.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 5e498ab6c..db4721b70 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -47,6 +47,7 @@ be inserted as the extension commonly used to identify files written in this language. If no entry is found in this list, then the name of the language is used." :group 'org-babel-tangle + :version "24.1" :type '(repeat (cons (string "Language name") @@ -55,16 +56,19 @@ then the name of the language is used." (defcustom org-babel-post-tangle-hook nil "Hook run in code files tangled by `org-babel-tangle'." :group 'org-babel + :version "24.1" :type 'hook) (defcustom org-babel-pre-tangle-hook '(save-buffer) "Hook run at the beginning of `org-babel-tangle'." :group 'org-babel + :version "24.1" :type 'hook) (defcustom org-babel-tangle-body-hook nil "Hook run over the contents of each code block body." :group 'org-babel + :version "24.1" :type 'hook) (defcustom org-babel-tangle-comment-format-beg "[[%link][%source-name]]" @@ -79,6 +83,7 @@ information into the output using `org-fill-template'. Whether or not comments are inserted during tangling is controlled by the :comments header argument." :group 'org-babel + :version "24.1" :type 'string) (defcustom org-babel-tangle-comment-format-end "%source-name ends here" @@ -93,6 +98,7 @@ information into the output using `org-fill-template'. Whether or not comments are inserted during tangling is controlled by the :comments header argument." :group 'org-babel + :version "24.1" :type 'string) (defcustom org-babel-process-comment-text #'org-babel-trim @@ -101,6 +107,7 @@ inserted as comments in tangled source-code files. The function should take a single string argument and return a string result. The default value is `org-babel-trim'." :group 'org-babel + :version "24.1" :type 'function) (defun org-babel-find-file-noselect-refresh (file) From b0c26bd967b21f6c9f3985a6bf8de1aa3c3d5531 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:17:00 +0200 Subject: [PATCH 07/37] Add :version to org-html.el options. --- lisp/org-html.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lisp/org-html.el b/lisp/org-html.el index 69d88fe7e..5cecc44a2 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -64,6 +64,7 @@ by the footnotes themselves." (defcustom org-export-html-footnote-separator ", " "Text used to separate footnotes." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-coding-system nil @@ -252,6 +253,7 @@ You can also customize this for each buffer, using something like #+MATHJAX: scale:\"133\" align:\"right\" mathml:t path:\"/MathJax/\"" :group 'org-export-html + :version "24.1" :type '(list :greedy t (list :tag "path (the path from where to load MathJax.js)" (const :format " " path) (string)) @@ -335,6 +337,7 @@ You can also customize this for each buffer, using something like " "The MathJax setup for XHTML files." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-tag-class-prefix "" @@ -361,6 +364,7 @@ It requires to %s: both will be replaced by the anchor referring to the headline (e.g. \"sec-2\"). When set to `nil', don't insert HTML anchors in headlines." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-preamble t @@ -392,6 +396,7 @@ precedence over this variable." If you need to use a \"%\" character, you need to escape it like that: \"%%\"." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-postamble 'auto @@ -432,6 +437,7 @@ precedence over this variable." If you need to use a \"%\" character, you need to escape it like that: \"%%\"." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-home/up-format @@ -548,6 +554,7 @@ When nil, alignment will only be specified in the column tags, but this is ignored by some browsers (like Firefox, Safari). Opera does it right though." :group 'org-export-tables + :version "24.1" :type 'boolean) (defcustom org-export-html-table-use-header-tags-for-first-column nil @@ -578,6 +585,7 @@ When nil, also column one will use data tags." (">" . ">")) "Alist of characters to be converted by `org-html-protect'." :group 'org-export-html + :version "24.1" :type '(repeat (cons (string :tag "Character") (string :tag "HTML equivalent")))) @@ -639,6 +647,7 @@ 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.1" :type '(list (string :tag " Div for the preamble:") (string :tag " Div for the content:") From b74be30199a36e3d6f92a96b01335dca5efc5c5d Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:21:04 +0200 Subject: [PATCH 08/37] Add :version to org-bibtex.el options. --- lisp/org-bibtex.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index fc0686035..21e36a7c1 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -216,12 +216,14 @@ (defcustom org-bibtex-autogen-keys nil "Set to a truth value to use `bibtex-generate-autokey' to generate keys." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-prefix nil "Optional prefix for all bibtex property names. For example setting to 'BIB_' would allow interoperability with fireforg." :group 'org-bibtex + :version "24.1" :type 'string) (defcustom org-bibtex-treat-headline-as-title t @@ -230,6 +232,7 @@ If an entry is missing a title property, use the headline text as the property. If this value is t, `org-bibtex-check' will ignore a missing title field." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-export-arbitrary-fields nil @@ -238,6 +241,7 @@ This only has effect if `org-bibtex-prefix' is defined, so as to ensure that other org-properties, such as CATEGORY or LOGGING are not placed in the exported bibtex entry." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-key-property "CUSTOM_ID" @@ -247,11 +251,13 @@ bibtex headlines from within an org file. This can be set to ID to enable global links, but only with great caution, as global IDs must be unique." :group 'org-bibtex + :version "24.1" :type 'string) (defcustom org-bibtex-tags nil "List of tag(s) that should be added to new bib entries." :group 'org-bibtex + :version "24.1" :type '(repeat :tag "Tag" (string))) (defcustom org-bibtex-tags-are-keywords nil @@ -266,17 +272,20 @@ comma-separated string of keywords when exported to bibtex. Tags defined in `org-bibtex-tags' or `org-bibtex-no-export-tags' will not be exported." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-no-export-tags nil "List of tag(s) that should not be converted to keywords. This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t." :group 'org-bibtex + :version "24.1" :type '(repeat :tag "Tag" (string))) (defcustom org-bibtex-type-property-name "btype" "Property in which to store bibtex entry type (e.g., article)." :group 'org-bibtex + :version "24.1" :type 'string) From 4b849731f36008547480cf91323cf558a5f90a05 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:22:15 +0200 Subject: [PATCH 09/37] Add :version to org-faces.el options. --- lisp/org-faces.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/org-faces.el b/lisp/org-faces.el index e71ce2322..481d662ec 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -351,6 +351,7 @@ keywords will then be interpreted as either foreground or background color." :group 'org-faces :group 'org-todo + :version "24.1" :type '(repeat (cons (choice (const todo) (const tag) (const priority)) (choice (const :foreground) (const :background))))) @@ -547,6 +548,7 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword." When nil, format these as normal Org. This is the default, because the content of these blocks will still be treated as Org syntax." :group 'org-faces + :version "24.1" :type 'boolean) (defface org-clock-overlay ;; copied from secondary-selection @@ -732,6 +734,7 @@ If nil, then all levels >=org-n-level-faces are styled like level org-n-level-faces" :group 'org-appearance :group 'org-faces + :version "24.1" :type 'boolean) (defface org-latex-and-export-specials From 18a0b31022c3695536905167e9b20e66b2acbb4e Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:22:38 +0200 Subject: [PATCH 10/37] Add :version to org-inlinetask.el option. --- lisp/org-inlinetask.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index a14e4043e..5cd190050 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -173,6 +173,7 @@ or, with the additional package \"todonotes\" for LaTeX, This should be the state `org-inlinetask-insert-task' should use by default, or nil of no state should be assigned." :group 'org-inlinetask + :version "24.1" :type '(choice (const :tag "No state" nil) (string :tag "Specific state"))) From 2894045bba53ca2cf088902ac6a301ab696a61c2 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:23:15 +0200 Subject: [PATCH 11/37] Add :version to org-docbook.el options. --- lisp/org-docbook.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el index 8c0bcd784..c3fd62c1f 100644 --- a/lisp/org-docbook.el +++ b/lisp/org-docbook.el @@ -150,6 +150,7 @@ avoid same set of footnote IDs being used multiple times." (defcustom org-export-docbook-footnote-separator ", " "Text used to separate footnotes." :group 'org-export-docbook + :version "24.1" :type 'string) (defcustom org-export-docbook-emphasis-alist @@ -195,6 +196,7 @@ This XSLT stylesheet is used by Object (FO) files. You can use either `fo/docbook.xsl' that comes with DocBook, or any customization layer you may have." :group 'org-export-docbook + :version "24.1" :type 'string) (defcustom org-export-docbook-xslt-proc-command nil From cd2f3954164faee99c1ff4711f822c01207973e7 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:24:12 +0200 Subject: [PATCH 12/37] Add :version to org-table.el options. --- lisp/org-table.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/org-table.el b/lisp/org-table.el index 62c24c2e3..ae12cee2a 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -169,11 +169,13 @@ window configuration, it is not recommended to set this variable to nil, except maybe locally in a special file that has mostly tables with long fields." :group 'org-table + :version "24.1" :type 'boolean) (defcustom org-table-fix-formulas-confirm nil "Whether the user should confirm when Org fixes formulas." :group 'org-table-editing + :version "24.1" :type '(choice (const :tag "with yes-or-no" yes-or-no-p) (const :tag "with y-or-n" y-or-n-p) @@ -236,6 +238,7 @@ number of hours. Other allowed values are 'seconds, 'minutes and 'days, and the output will be a fraction of seconds, minutes or days." :group 'org-table-calculation + :version "24.1" :type '(choice (symbol :tag "Seconds" 'seconds) (symbol :tag "Minutes" 'minutes) (symbol :tag "Hours " 'hours) @@ -247,6 +250,7 @@ For example, using \"~%s~\" will display the result within tilde characters. Beware that modifying the display can prevent the field from being used in another formula." :group 'org-table-settings + :version "24.1" :type 'string) (defcustom org-table-formula-evaluate-inline t From 8275726e7e6505fca04538b62b7de9a1e3657dec Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:24:40 +0200 Subject: [PATCH 13/37] Add :version to org-habit.el options. --- lisp/org-habit.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-habit.el b/lisp/org-habit.el index d019f3aea..6b4776662 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -70,11 +70,13 @@ relative to the current effective date." (defcustom org-habit-today-glyph ?! "Glyph character used to identify today." :group 'org-habit + :version "24.1" :type 'character) (defcustom org-habit-completed-glyph ?* "Glyph character used to show completed days on which a task was done." :group 'org-habit + :version "24.1" :type 'character) (defface org-habit-clear-face From d5220e906fabb11e7ef7811b01656f93e72c1d7e Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:26:05 +0200 Subject: [PATCH 14/37] Add :version to org-exp.el options. --- lisp/org-exp.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index b5901a54b..174619a3b 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -98,6 +98,7 @@ is nil, the buffer remains buried also in these cases." This applied to the commands `org-export-as-html-and-open' and `org-export-as-pdf-and-open'." :group 'org-export-general + :version "24.1" :type 'boolean) (defcustom org-export-run-in-background nil @@ -120,6 +121,7 @@ force an export command into the current process." "The initial scope when exporting with `org-export'. This variable can be either set to 'buffer or 'subtree." :group 'org-export-general + :version "24.1" :type '(choice (const :tag "Export current buffer" 'buffer) (const :tag "Export current subtree" 'subtree))) @@ -220,6 +222,7 @@ and in `org-clock-clocktable-language-setup'." (defcustom org-export-date-timestamp-format "%Y-%m-%d" "Time string format for Org timestamps in the #+DATE option." :group 'org-export-general + :version "24.1" :type 'string) (defvar org-export-page-description "" @@ -317,6 +320,7 @@ done include only tasks that are already done. nil remove all tasks before export list of TODO kwds keep only tasks with these keywords" :group 'org-export-general + :version "24.1" :type '(choice (const :tag "All tasks" t) (const :tag "No tasks" nil) @@ -367,6 +371,7 @@ e.g. \"author:nil\"." This option can also be set with the +OPTIONS line, e.g. \"email:t\"." :group 'org-export-general + :version "24.1" :type 'boolean) (defcustom org-export-creator-info t @@ -594,6 +599,7 @@ the values of constants may be useful to have." This is the global equivalent of the :remove-nil-lines option when locally sending a table with #+ORGTBL." :group 'org-export-tables + :version "24.1" :type 'boolean) (defcustom org-export-prefer-native-exporter-for-tables nil From bdd922e3f7d7d08c27714428c6eb4129eeaed126 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:27:34 +0200 Subject: [PATCH 15/37] Add :version to org-clock.el options. --- lisp/org-clock.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index cdf4a1aa6..7105bfe13 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -226,6 +226,7 @@ should get a different face (`org-mode-line-clock-overrun'). When this is a string, it is prepended to the clock string as an indication, also using the face `org-mode-line-clock-overrun'." :group 'org-clock + :version "24.1" :type '(choice (const :tag "Just mark the time string" nil) (string :tag "Text to prepend"))) @@ -267,12 +268,14 @@ string as argument." :formatter nil) "Default properties for clock tables." :group 'org-clock + :version "24.1" :type 'plist) (defcustom org-clock-clocktable-formatter 'org-clocktable-write-default "Function to turn clocking data into a table. For more information, see `org-clocktable-write-default'." :group 'org-clocktable + :version "24.1" :type 'function) ;; FIXME: translate es and nl last string "Clock summary at" @@ -283,6 +286,7 @@ For more information, see `org-clocktable-write-default'." ("nl" "Bestand" "N" "Tijdstip" "Hoofding" "Duur" "ALLES" "Totale duur" "Bestandstijd" "Clock summary at")) "Terms used in clocktable, translated to different languages." :group 'org-clocktable + :version "24.1" :type 'alist) (defcustom org-clock-clocktable-default-properties '(:maxlevel 2 :scope file) @@ -310,11 +314,13 @@ play with them." (defcustom org-clock-report-include-clocking-task nil "When non-nil, include the current clocking task time in clock reports." :group 'org-clock + :version "24.1" :type 'boolean) (defcustom org-clock-resolve-expert nil "Non-nil means do not show the splash buffer with the clock resolver." :group 'org-clock + :version "24.1" :type 'boolean) (defvar org-clock-in-prepare-hook nil From b846a86cfaae5e64a9060cc38a69577b6bcc5333 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:28:23 +0200 Subject: [PATCH 16/37] Add :version to ob.el options. --- lisp/ob.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/ob.el b/lisp/ob.el index 79ffe732e..ac6de9f1b 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -105,6 +105,7 @@ against accidental code block evaluation. The `org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to remove code block execution from the C-c C-c keybinding." :group 'org-babel + :version "24.1" :type '(choice boolean function)) ;; don't allow this variable to be changed through file settings (put 'org-confirm-babel-evaluate 'safe-local-variable (lambda (x) (eq x t))) @@ -112,6 +113,7 @@ remove code block execution from the C-c C-c keybinding." (defcustom org-babel-no-eval-on-ctrl-c-ctrl-c nil "Remove code block evaluation from the C-c C-c key binding." :group 'org-babel + :version "24.1" :type 'boolean) (defcustom org-babel-results-keyword "RESULTS" From 5e3cf1bd262d1666ab65b6b644d52ef7c5eb2724 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:28:51 +0200 Subject: [PATCH 17/37] Add :version to org-entities.el options. --- lisp/org-entities.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-entities.el b/lisp/org-entities.el index fe3c52892..8b5b3f312 100644 --- a/lisp/org-entities.el +++ b/lisp/org-entities.el @@ -44,6 +44,7 @@ For example, this will replace \"\\nsup\" with \"[not a superset of]\" in backends where the corresponding character is not available." :group 'org-entities + :version "24.1" :type 'boolean) (defcustom org-entities-user nil @@ -68,6 +69,7 @@ utf-8 replacement Use the special characters available in utf-8. If you define new entities here that require specific LaTeX packages to be loaded, add these packages to `org-export-latex-packages-alist'." :group 'org-entities + :version "24.1" :type '(repeat (list (string :tag "name ") From 346dc97753cb71c54bea5f180dc8d2f928487e81 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:29:15 +0200 Subject: [PATCH 18/37] Add :version to ob-picolisp.el option. --- lisp/ob-picolisp.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el index 291c0929f..06c9ab8df 100644 --- a/lisp/ob-picolisp.el +++ b/lisp/ob-picolisp.el @@ -76,6 +76,7 @@ (defcustom org-babel-picolisp-cmd "pil" "Name of command used to evaluate picolisp blocks." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-expand-body:picolisp (body params &optional processed-params) From e97aec45a48423660170e3f1c0d01685296272c8 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:29:41 +0200 Subject: [PATCH 19/37] Add :version to org-gnus.el option. --- lisp/org-gnus.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el index f0c64a0d7..5b855c291 100644 --- a/lisp/org-gnus.el +++ b/lisp/org-gnus.el @@ -62,6 +62,7 @@ configured) IMAP servers don't support this operation quickly. So if following a link to a Gnus article takes ages, try setting this variable to `t'." :group 'org-link-store + :version "24.1" :type 'boolean) From 5bb982881a6763ed2324c5916605e9232a25d14f Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:30:07 +0200 Subject: [PATCH 20/37] Add :version to ob-lisp.el option. --- lisp/ob-lisp.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el index 3a6020d9e..8fb672196 100644 --- a/lisp/ob-lisp.el +++ b/lisp/ob-lisp.el @@ -49,6 +49,7 @@ For example a value of \"(progn ;; %s\\n %%s)\" would ignore the current directory string." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-expand-body:lisp (body params) From db138ea1f9ce1eb9537acdf4c72fb8ce98922e8a Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:31:06 +0200 Subject: [PATCH 21/37] Add :version to org-wl.el options. --- lisp/org-wl.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/org-wl.el b/lisp/org-wl.el index 6d2370671..8a79ec0d7 100644 --- a/lisp/org-wl.el +++ b/lisp/org-wl.el @@ -46,11 +46,13 @@ (defcustom org-wl-link-remove-filter nil "Remove filter condition if message is filter folder." :group 'org-wl + :version "24.1" :type 'boolean) (defcustom org-wl-shimbun-prefer-web-links nil "If non-nil create web links for shimbun messages." :group 'org-wl + :version "24.1" :type 'boolean) (defcustom org-wl-nntp-prefer-web-links nil @@ -58,16 +60,19 @@ When folder name contains string \"gmane\" link to gmane, googlegroups otherwise." :type 'boolean + :version "24.1" :group 'org-wl) (defcustom org-wl-disable-folder-check t "Disable check for new messages when open a link." :type 'boolean + :version "24.1" :group 'org-wl) (defcustom org-wl-namazu-default-index nil "Default namazu search index." :type 'directory + :version "24.1" :group 'org-wl) ;; Declare external functions and variables From cbd1a1229560b3880d1cb013de2fd179f31035b7 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:31:35 +0200 Subject: [PATCH 22/37] Add :version to org-archive.el options. --- lisp/org-archive.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-archive.el b/lisp/org-archive.el index 4137e2caf..db3b8250b 100644 --- a/lisp/org-archive.el +++ b/lisp/org-archive.el @@ -43,6 +43,7 @@ (defcustom org-archive-reversed-order nil "Non-nil means make the tree first child under the archive heading, not last." :group 'org-archive + :version "24.1" :type 'boolean) (defcustom org-archive-sibling-heading "Archive" @@ -72,6 +73,7 @@ This variable is obsolete and has no effect anymore, instead add or remove (defcustom org-archive-subtree-add-inherited-tags 'infile "Non-nil means append inherited tags when archiving a subtree." :group 'org-archive + :version "24.1" :type '(choice (const :tag "Never" nil) (const :tag "When archiving a subtree to the same file" infile) From c19f5c3c0d1efb373df6b0343042322485ceff3d Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:32:23 +0200 Subject: [PATCH 23/37] Add :version to org-list.el options. --- lisp/org-list.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/org-list.el b/lisp/org-list.el index 2caecff27..c37758883 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -215,6 +215,7 @@ Both uppercase and lowercase are handled. Lists with more than 26 items will fallback to standard numbering. Alphabetical counters like \"[@c]\" will be recognized." :group 'org-plain-lists + :version "24.1" :type 'boolean) (defcustom org-list-two-spaces-after-bullet-regexp nil @@ -258,6 +259,7 @@ indent when non-nil, indenting or outdenting list top-item outdenting a list whose bullet is * to column 0 will change that bullet to \"-\"." :group 'org-plain-lists + :version "24.1" :type '(alist :tag "Sets of rules" :key-type (choice @@ -277,6 +279,7 @@ This affects the behavior of \\[org-move-item-up], \\[org-move-item-down], \\[org-next-item] and \\[org-previous-item]." :group 'org-plain-lists + :version "24.1" :type 'boolean) (defvar org-checkbox-statistics-hook nil @@ -306,6 +309,7 @@ When the indentation would be larger than this, it will become By setting this to a small number, usually 1 or 2, one can more clearly distinguish sub-items in a list." :group 'org-plain-lists + :version "24.1" :type 'integer) (defcustom org-list-radio-list-templates From e77534b8b41fb921f237e5d72990d2e5e287958b Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:33:59 +0200 Subject: [PATCH 24/37] Add :version to org-exp-blocks.el option. --- lisp/org-exp-blocks.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el index 438a580d8..7d466cec6 100644 --- a/lisp/org-exp-blocks.el +++ b/lisp/org-exp-blocks.el @@ -136,6 +136,7 @@ export function should accept three arguments." (defcustom org-export-blocks-postblock-hook nil "Run after blocks have been processed with `org-export-blocks-preprocess'." :group 'org-export-general + :version "24.1" :type 'hook) (defun org-export-blocks-html-quote (body &optional open close) From 08ba2acbb3b8e4e18ef46445a0735ee4c8ca5e22 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:35:41 +0200 Subject: [PATCH 25/37] Add :version to org-taskjuggler.el options. --- lisp/org-taskjuggler.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index c1a59ee70..440901358 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -166,28 +166,33 @@ (defcustom org-export-taskjuggler-extension ".tjp" "Extension of TaskJuggler files." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-project-tag "taskjuggler_project" "Tag, property or todo used to find the tree containing all the tasks for the project." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-resource-tag "taskjuggler_resource" "Tag, property or todo used to find the tree containing all the resources for the project." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-target-version 2.4 "Which version of TaskJuggler the exporter is targeting." :group 'org-export-taskjuggler + :version "24.1" :type 'number) (defcustom org-export-taskjuggler-default-project-version "1.0" "Default version string for the project." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-default-project-duration 280 @@ -195,6 +200,7 @@ resources for the project." in the root node of the task tree, i.e. the tree that has been marked with `org-export-taskjuggler-project-tag'" :group 'org-export-taskjuggler + :version "24.1" :type 'integer) (defcustom org-export-taskjuggler-default-reports @@ -214,6 +220,7 @@ with `org-export-taskjuggler-project-tag'" }") "Default reports for the project." :group 'org-export-taskjuggler + :version "24.1" :type '(repeat (string :tag "Report"))) (defcustom org-export-taskjuggler-default-global-properties @@ -230,6 +237,7 @@ include another TaskJuggler file. The global properties are inserted after the project declaration but before any resource and task declarations." :group 'org-export-taskjuggler + :version "24.1" :type '(string :tag "Preamble")) ;;; Hooks From ae4ba1b35c4c4b7604ed524eadb43d1db3842ffc Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:40:11 +0200 Subject: [PATCH 26/37] Add :version to org-agenda.el options. --- lisp/org-agenda.el | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 81377cae8..324ddd27f 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -649,6 +649,7 @@ See also the variable `org-agenda-tags-todo-honor-ignore-options' if you want to make his option also apply to the tags-todo list." :group 'org-agenda-skip :group 'org-agenda-todo-list + :version "24.1" :type '(choice (const :tag "Ignore future timestamp todos" future) (const :tag "Ignore past or present timestamp todos" past) @@ -796,6 +797,7 @@ trigger you to schedule it, and then you don't want to be reminded of it because you will take care of it on the day when scheduled." :group 'org-agenda-skip :group 'org-agenda-daily/weekly + :version "24.1" :type '(choice (const :tag "Alwas show prewarning" nil) (const :tag "Remove prewarning if entry is scheduled" t) @@ -860,6 +862,7 @@ property so than moving the mouse over the command shows it. Setting it to nil is good if matcher strings are very long and/or if you want to use two-column display (see `org-agenda-menu-two-column')." :group 'org-agenda + :version "24.1" :type 'boolean) (defcustom org-agenda-menu-two-column nil @@ -867,6 +870,7 @@ you want to use two-column display (see `org-agenda-menu-two-column')." If you use this, you probably want to set `org-agenda-menu-show-matcher' to nil." :group 'org-agenda + :version "24.1" :type 'boolean) (defcustom org-finalize-agenda-hook nil @@ -890,6 +894,7 @@ Needs to be set before org.el is loaded." "Non-nil means `org-agenda-follow-mode' displays only the current item's tree, in an indirect buffer." :group 'org-agenda + :version "24.1" :type 'boolean) (defcustom org-agenda-show-outline-path t @@ -1042,11 +1047,13 @@ This function makes sure that dates are aligned for easy reading." "Non-nil means use leading zero for military times in agenda. For example, 9:30am would become 09:30 rather than 9:30." :group 'org-agenda-daily/weekly + :version "24.1" :type 'boolean) (defcustom org-agenda-timegrid-use-ampm nil "When set, show AM/PM style timestamps on the timegrid." :group 'org-agenda + :version "24.1" :type 'boolean) (defun org-agenda-time-of-day-to-ampm (time) @@ -1094,6 +1101,7 @@ stamp currently points to the past, the first key press will move it to today. WHen nil, just move one day forward even if the date stays in the past." :group 'org-agenda-daily/weekly + :version "24.1" :type 'boolean) (defcustom org-agenda-include-diary nil @@ -1106,6 +1114,7 @@ Custom commands can set this variable in the options section." "If non-nil, include entries within their deadline warning period. Custom commands can set this variable in the options section." :group 'org-agenda-daily/weekly + :version "24.1" :type 'boolean) (defcustom org-agenda-repeating-timestamp-show-all t @@ -1181,6 +1190,7 @@ issue display. :short-face face for clock intervals that are too short" :group 'org-agenda-daily/weekly :group 'org-clock + :version "24.1" :type 'plist) (defcustom org-agenda-log-mode-add-notes t @@ -1239,6 +1249,7 @@ by preceding the first snippet with \"+\" or \"-\". If the first snippet is a regexp marked with braces like \"{abc}\", this will also switch to boolean search." :group 'org-agenda-search-view + :version "24.1" :type 'boolean) (if (fboundp 'defvaralias) @@ -1249,6 +1260,7 @@ boolean search." "Non-nil means, search words must be matches as complete words. When nil, they may also match part of a word." :group 'org-agenda-search-view + :version "24.1" :type 'boolean) (defgroup org-agenda-time-grid nil @@ -1312,12 +1324,14 @@ a grid line." (defcustom org-agenda-show-current-time-in-grid t "Non-nil means show the current time in the time grid." :group 'org-agenda-time-grid + :version "24.1" :type 'boolean) (defcustom org-agenda-current-time-string "now - - - - - - - - - - - - - - - - - - - - - - - - -" "The string for the current time marker in the agenda." :group 'org-agenda-time-grid + :version "24.1" :type 'string) (defgroup org-agenda-sorting nil @@ -1528,6 +1542,7 @@ that passed since this item was scheduled first." "Text preceding item pulled into the agenda by inactive time stamps. These entries are added to the agenda when pressing \"[\"." :group 'org-agenda-line-format + :version "24.1" :type '(list (string :tag "Scheduled today ") (string :tag "Scheduled previously"))) @@ -1566,6 +1581,7 @@ the headline/diary entry." "Non-nil means remove time ranges specifications in agenda items that span on several days." :group 'org-agenda-line-format + :version "24.1" :type 'boolean) (defcustom org-agenda-default-appointment-duration nil @@ -1647,6 +1663,7 @@ The only argument passed to that function is the day. It should returns a face, or nil if does not want to specify a face and let the normal rules apply." :group 'org-agenda-line-format + :version "24.1" :type 'function) (defcustom org-agenda-category-icon-alist nil @@ -1679,6 +1696,7 @@ category, you can use: (\"Emacs\" '(space . (:width (16))))" :group 'org-agenda-line-format + :version "24.1" :type '(alist :key-type (string :tag "Regexp matching category") :value-type (choice (list :tag "Icon" (string :tag "File or data") @@ -1741,6 +1759,7 @@ With selected entries in an agenda buffer, `B R' will call the custom function `set-category' on the selected entries. Note that functions in this alist don't need to be quoted." :type 'alist + :version "24.1" :group 'org-agenda) (eval-when-compile @@ -7998,6 +8017,7 @@ top-level as top-level entries at the end of the file." (defcustom org-agenda-insert-diary-extract-time nil "Non-nil means extract any time specification from the diary entry." :group 'org-agenda + :version "24.1" :type 'boolean) (defun org-agenda-add-entry-to-org-agenda-diary-file (type text &optional d1 d2) From 198f5853508fb73670c8c67741009a548b51671d Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:41:12 +0200 Subject: [PATCH 27/37] Add :version to org-icalendar.el options. --- lisp/org-icalendar.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el index 29f6c74c5..d73a6195b 100644 --- a/lisp/org-icalendar.el +++ b/lisp/org-icalendar.el @@ -54,6 +54,7 @@ for timed events. If non-zero, alarms are created. - The alarm will go off N minutes before the event - only a DISPLAY action is defined." :group 'org-export-icalendar + :version "24.1" :type 'integer) (defcustom org-icalendar-combined-name "OrgMode" @@ -64,6 +65,7 @@ for timed events. If non-zero, alarms are created. (defcustom org-icalendar-combined-description nil "Calendar description for the combined iCalendar (all agenda files)." :group 'org-export-icalendar + :version "24.1" :type 'string) (defcustom org-icalendar-use-plain-timestamp t @@ -74,6 +76,7 @@ for timed events. If non-zero, alarms are created. (defcustom org-icalendar-honor-noexport-tag nil "Non-nil means don't export entries with a tag in `org-export-exclude-tags'." :group 'org-export-icalendar + :version "24.1" :type 'boolean) (defcustom org-icalendar-use-deadline '(event-if-not-todo todo-due) @@ -213,6 +216,7 @@ Interesting value are: - \":%Y%m%dT%H%M%SZ\" for time expressed in Universal Time" :group 'org-export-icalendar + :version "24.1" :type '(choice (const :tag "Local time" ":%Y%m%dT%H%M%S") (const :tag "Explicit local time" ";TZID=%Z:%Y%m%dT%H%M%S") From 7ffea1b7b9b269f55d9e91bebfdd79f7e2a1bacd Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:41:37 +0200 Subject: [PATCH 28/37] Add :version to ob-js.el option. --- lisp/ob-js.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ob-js.el b/lisp/ob-js.el index e9c3dbb4f..20cad4e6b 100644 --- a/lisp/ob-js.el +++ b/lisp/ob-js.el @@ -55,6 +55,7 @@ (defcustom org-babel-js-cmd "node" "Name of command used to evaluate js blocks." :group 'org-babel + :version "24.1" :type 'string) (defvar org-babel-js-function-wrapper From 117f14d3456aba1c9f10faf07d7850ed7987de23 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:41:59 +0200 Subject: [PATCH 29/37] Add :version to ob-exp.el option. --- lisp/ob-exp.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index 4a909c3f5..0f0cca3d9 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -43,6 +43,7 @@ When set to nil no code will be evaluated as part of the export process." :group 'org-babel + :version "24.1" :type 'boolean) (put 'org-export-babel-evaluate 'safe-local-variable (lambda (x) (eq x nil))) From 8ca9c1b1958bef6ad976fe7bf5322e55b2b965aa Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:43:06 +0200 Subject: [PATCH 30/37] Add :version to org-capture.el options. --- lisp/org-capture.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 775606b4c..454463f70 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -262,6 +262,7 @@ w3, w3m | %:type %:url info | %:type %:file %:node calendar | %:type %:date" :group 'org-capture + :version "24.1" :type '(repeat (choice :value ("" "" entry (file "~/org/notes.org") "") @@ -336,12 +337,14 @@ calendar | %:type %:date" The capture buffer is still current when this hook runs and it is widened to the entire buffer." :group 'org-capture + :version "24.1" :type 'hook) (defcustom org-capture-after-finalize-hook nil "Hook that is run right after a capture process is finalized. Suitable for window cleanup" :group 'org-capture + :version "24.1" :type 'hook) ;;; The property list for keeping information about the capture process From a0d59ff6a3ed2b517588b36a2571822fb4ac51dd Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:43:36 +0200 Subject: [PATCH 31/37] Add :version to ob-plantuml.el option. --- lisp/ob-plantuml.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index da700527f..55729eb41 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -44,6 +44,7 @@ (defcustom org-plantuml-jar-path nil "Path to the plantuml.jar file." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-execute:plantuml (body params) From 6e2207fc0a4c6a3ae0d9fb59c28c4ecdbcee8f55 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:43:54 +0200 Subject: [PATCH 32/37] Add :version to org-attach.el option. --- lisp/org-attach.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 6881940f1..a87993f4b 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -101,6 +101,7 @@ ln create a hard link. Note that this is not supported (defcustom org-attach-store-link-p nil "Non-nil means store a link to a file when attaching it." :group 'org-attach + :version "24.1" :type '(choice (const :tag "Don't store link" nil) (const :tag "Link to origin location" t) From 7a6b863a7649799ec5c801656cc6b0fecee6b65a Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:44:15 +0200 Subject: [PATCH 33/37] Add :version to ob-scheme.el option. --- lisp/ob-scheme.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index 211acaa69..ce2992840 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -54,6 +54,7 @@ (defcustom org-babel-scheme-cmd "guile" "Name of command used to evaluate scheme blocks." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-expand-body:scheme (body params) From 1d98ecf9804f5070c356f33aca747b9b03728314 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:44:58 +0200 Subject: [PATCH 34/37] Add :version to org-src.el option. --- lisp/org-src.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-src.el b/lisp/org-src.el index 0a67d79f2..496dafe5e 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -761,6 +761,7 @@ Org-babel commands." "If non-nil, the effect of TAB in a code block is as if it were issued in the language major mode buffer." :type 'boolean + :version "24.1" :group 'org-babel) (defun org-src-native-tab-command-maybe () From 38e95cd08872e9a72e894f0f1591d31c87d961cf Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:48:32 +0200 Subject: [PATCH 35/37] Add :version to org-timer.el option. --- lisp/org-timer.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 44a53ad0f..a3bde0fd7 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -53,6 +53,7 @@ the value of the relative timer." "The default timer when a timer is set. When 0, the user is prompted for a value." :group 'org-time + :version "24.1" :type 'number) (defvar org-timer-start-hook nil From c55604074d6645a8e5367a056a73689b1bb7c250 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 13:53:49 +0200 Subject: [PATCH 36/37] Add :version to org.el options. --- lisp/org.el | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index 43d7cf57c..0f13223d0 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -152,6 +152,7 @@ keybinding. By default only Emacs Lisp (which has no requirements) is loaded." :group 'org-babel :set 'org-babel-do-load-languages + :version "24.1" :type '(alist :tag "Babel Languages" :key-type (choice @@ -200,6 +201,7 @@ When non-nil, clones of a subtree don't inherit the ID property. Otherwise they inherit the ID property with a new unique identifier." :type 'boolean + :version "24.1" :group 'org-id) ;;; Version @@ -259,6 +261,7 @@ With prefix arg HERE, insert it at point." (defcustom org-log-buffer-setup-hook nil "Hook that is run after an Org log buffer is created." :group 'org + :version "24.1" :type 'hook) (defvar org-modules) ; defined below @@ -428,6 +431,7 @@ already archived entries." (const :tag "All headlines in active region" t) (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 :group 'org-archive) @@ -496,6 +500,7 @@ Not all export backends support this, but HTML does. This option can also be set with the +OPTIONS line, e.g. \"^:nil\"." :group 'org-startup :group 'org-export-translation + :version "24.1" :type '(choice (const :tag "Always interpret" t) (const :tag "Only with braces" {}) @@ -512,6 +517,7 @@ the following lines anywhere in the buffer: #+STARTUP: beamer" :group 'org-startup + :version "24.1" :type 'boolean) (defcustom org-startup-align-all-tables nil @@ -532,6 +538,7 @@ the following lines anywhere in the buffer: #+STARTUP: inlineimages #+STARTUP: noinlineimages" :group 'org-startup + :version "24.1" :type 'boolean) (defcustom org-insert-mode-line-in-empty-file nil @@ -1069,6 +1076,7 @@ used to kill (part-of) a headline that has hidden text behind it. Any other non-nil value will result in a query to the user, if it is OK to kill that hidden subtree. When nil, kill without remorse." :group 'org-edit-structure + :version "24.1" :type '(choice (const :tag "Do not protect hidden subtrees" nil) (const :tag "Protect hidden subtrees with a security query" t) @@ -1089,6 +1097,7 @@ smart Make point visible, and do insertion/deletion if it is allows insertion and backward-delete right before ellipses. FIXME: maybe in this case we should not even show?" :group 'org-edit-structure + :version "24.1" :type '(choice (const :tag "Do not check" nil) (const :tag "Throw error when trying to edit" error) @@ -1542,6 +1551,7 @@ Changing this requires a restart of Emacs to work correctly." When nil, the link search tries to match a phrase with all words in the search text." :group 'org-link-follow + :version "24.1" :type '(choice (const :tag "Use fuzzy text search" nil) (const :tag "Match only exact headline" t) @@ -1661,6 +1671,7 @@ single keystroke rather than having to type \"yes\"." (defcustom org-confirm-shell-link-not-regexp "" "A regexp to skip confirmation for shell links." :group 'org-link-follow + :version "24.1" :type 'regexp) (defcustom org-confirm-elisp-link-function 'yes-or-no-p @@ -1686,6 +1697,7 @@ single keystroke rather than having to type \"yes\"." (defcustom org-confirm-elisp-link-not-regexp "" "A regexp to skip confirmation for Elisp links." :group 'org-link-follow + :version "24.1" :type 'regexp) (defconst org-file-apps-defaults-gnu @@ -1908,6 +1920,7 @@ When bulk-refiling from the agenda, the value `note' is forbidden and will temporarily be changed to `time'." :group 'org-refile :group 'org-progress + :version "24.1" :type '(choice (const :tag "No logging" nil) (const :tag "Record timestamp" time) @@ -1983,6 +1996,7 @@ If you have added new entries to a buffer that might themselves be targets, you need to clear the cache manually by pressing `C-0 C-c C-w' or, if you find that easier, `C-u C-u C-u C-c C-w'." :group 'org-refile + :version "24.1" :type 'boolean) (defcustom org-refile-use-outline-path nil @@ -2038,6 +2052,7 @@ don't contain a set of subtrees, but it might be convenient to do so sometimes: in that case, the first line of the region is converted to a headline before refiling." :group 'org-refile + :version "24.1" :type 'boolean) (defgroup org-todo nil @@ -2511,6 +2526,7 @@ By default this is the first task in a TODO sequence, or the previous state in a TODO_TYP set. But you can specify another task here. alternatively, set the :REPEAT_TO_STATE: property of the entry." :group 'org-todo + :version "24.1" :type '(choice (const :tag "Head of sequence" nil) (string :tag "Specific state"))) @@ -2595,6 +2611,7 @@ an integer, increasing by 1000 for each priority level. The user can set a different function here, which should take a string as an argument and return the numeric priority." :group 'org-priorities + :version "24.1" :type 'function) (defgroup org-time nil @@ -2736,6 +2753,7 @@ But you can also set a deviating value here. This may t or nil, or the symbol `org-read-date-prefer-future'." :group 'org-agenda :group 'org-time + :version "24.1" :type '(choice (const :tag "Use org-read-date-prefer-future" org-read-date-prefer-future) @@ -2770,6 +2788,7 @@ has limited date range is not negligible. A workaround for this problem is to use diary sexp dates for time stamps outside of this range." :group 'org-time + :version "24.1" :type 'boolean) (defcustom org-read-date-display-live t @@ -2817,6 +2836,7 @@ For example, if `org-extend-today-until' is 8, and it's 4am, then the \"effective time\" of any timestamps between midnight and 8am will be 23:59 of the previous day." :group 'org-time + :version "24.1" :type 'boolean) (defcustom org-edit-timestamp-down-means-later nil @@ -2890,6 +2910,7 @@ tags in that file can be created dynamically (there are none). 'org-complete-tags-always-offer-all-agenda-tags) t)))" :group 'org-tags + :version "24.1" :type 'boolean) (defvar org-file-tags nil @@ -3058,6 +3079,7 @@ and the clock summary: (org-entry-get (point) \"Effort\")))) (org-minutes-to-hh:mm-string (- effort clocksum))))))" :group 'org-properties + :version "24.1" :type 'alist) (defcustom org-use-property-inheritance nil @@ -3329,6 +3351,7 @@ This is a property list with the following properties: "Non-nil means signal an error when image creation of LaTeX snippets fails. When nil, just push out a message." :group 'org-latex + :version "24.1" :type 'boolean) (defcustom org-latex-to-mathml-jar-file nil "Value of\"%j\" in `org-latex-to-mathml-convert-command'. @@ -3337,6 +3360,7 @@ Use this to specify additional executable file say a jar file. When using MathToWeb as the converter, specify the full-path to your mathtoweb.jar file." :group 'org-latex + :version "24.1" :type '(choice (const :tag "None" nil) (file :tag "JAR file" :must-match t))) @@ -3354,6 +3378,7 @@ This command is used by `org-create-math-formula'. When using MathToWeb as the converter, set this to \"java -jar %j -unicode -force -df %o %I\"." :group 'org-latex + :version "24.1" :type '(choice (const :tag "None" nil) (string :tag "\nShell command"))) @@ -3463,6 +3488,7 @@ compiling LaTeX snippets into images for inclusion into HTML." :group 'org-export-latex :set 'org-set-packages-alist :get 'org-get-packages-alist + :version "24.1" :type '(repeat (choice (list :tag "options/package pair" @@ -3528,6 +3554,7 @@ lines to the buffer: For example, a value '(title) for this list will make the document's title appear in the buffer without the initial #+TITLE: keyword." :group 'org-appearance + :version "24.1" :type '(set (const :tag "#+AUTHOR" author) (const :tag "#+DATE" date) (const :tag "#+EMAIL" email) @@ -3568,11 +3595,13 @@ org-level-* faces." "Non-nil means show entities as UTF8 characters. When nil, the \\name form remains in the buffer." :group 'org-appearance + :version "24.1" :type 'boolean) (defcustom org-pretty-entities-include-sub-superscripts t "Non-nil means, pretty entity display includes formatting sub/superscripts." :group 'org-appearance + :version "24.1" :type 'boolean) (defvar org-emph-re nil @@ -5356,6 +5385,7 @@ will be prompted for." (defcustom org-src-fontify-natively nil "When non-nil, fontify code in code blocks." :type 'boolean + :version "24.1" :group 'org-appearance :group 'org-babel) @@ -16205,6 +16235,7 @@ minutes. For example, if the value of this variable is ((\"hours\" . 60)), then an effort string \"2hours\" is equivalent to 120 minutes." :group 'org-agenda + :version "24.1" :type '(alist :key-type (string :tag "Modifier") :value-type (number :tag "Minutes"))) From e48d67ed6d6a0f352449fbeea6091b6f216c9990 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Apr 2012 14:07:26 +0200 Subject: [PATCH 37/37] org.el: Fix bug when gathering tag completion options. * org.el (org-fast-tag-selection): Fix bug when gathering tag completion options. TINYCHANGE Thanks to Noorul Islam K M for the patch. --- lisp/org.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 0f13223d0..49a715361 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13729,7 +13729,10 @@ Returns the new tags string, or nil to not change the current settings." (append (or buffer-tags (with-current-buffer buf (mapcar 'car (org-get-buffer-tags)))) - (mapcar 'car table))))) + (delq nil + (mapcar (lambda (x) + (if (stringp + (car x)) x)) table)))))) (quit (setq tg ""))) (when (string-match "\\S-" tg) (add-to-list 'buffer-tags (list tg))