aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Guerry2012-04-03 14:02:21 +0200
committerBastien Guerry2012-04-03 14:02:21 +0200
commit372d7b21b2835543c8d97c1dff4929be5270a2a7 (patch)
treeb5cac3b444c54b00a4153109299a397d74eb03fc
parent5c7ac47249bc16f6efc3085bc72a2d519ae1d834 (diff)
downloademacs-372d7b21b2835543c8d97c1dff4929be5270a2a7.tar.gz
emacs-372d7b21b2835543c8d97c1dff4929be5270a2a7.zip
Add :version tag to new Org options in Emacs 24.1
Diffstat
-rw-r--r--lisp/org/ob-exp.el1
-rw-r--r--lisp/org/ob-js.el1
-rw-r--r--lisp/org/ob-lisp.el1
-rw-r--r--lisp/org/ob-lob.el1
-rw-r--r--lisp/org/ob-picolisp.el1
-rw-r--r--lisp/org/ob-plantuml.el1
-rw-r--r--lisp/org/ob-scheme.el1
-rw-r--r--lisp/org/ob-tangle.el7
-rw-r--r--lisp/org/ob.el2
-rw-r--r--lisp/org/org-agenda.el20
-rw-r--r--lisp/org/org-archive.el2
-rw-r--r--lisp/org/org-attach.el1
-rw-r--r--lisp/org/org-beamer.el9
-rw-r--r--lisp/org/org-bibtex.el9
-rw-r--r--lisp/org/org-capture.el3
-rw-r--r--lisp/org/org-clock.el6
-rw-r--r--lisp/org/org-ctags.el2
-rw-r--r--lisp/org/org-docbook.el2
-rw-r--r--lisp/org/org-entities.el2
-rw-r--r--lisp/org/org-exp-blocks.el1
-rw-r--r--lisp/org/org-exp.el6
-rw-r--r--lisp/org/org-faces.el3
-rw-r--r--lisp/org/org-freemind.el1
-rw-r--r--lisp/org/org-gnus.el1
-rw-r--r--lisp/org/org-habit.el2
-rw-r--r--lisp/org/org-html.el9
-rw-r--r--lisp/org/org-icalendar.el4
-rw-r--r--lisp/org/org-inlinetask.el1
-rw-r--r--lisp/org/org-list.el4
-rw-r--r--lisp/org/org-mobile.el5
-rw-r--r--lisp/org/org-publish.el5
-rw-r--r--lisp/org/org-src.el1
-rw-r--r--lisp/org/org-table.el4
-rw-r--r--lisp/org/org-taskjuggler.el8
-rw-r--r--lisp/org/org-timer.el1
-rw-r--r--lisp/org/org-wl.el5
-rw-r--r--lisp/org/org.el35
37 files changed, 166 insertions, 2 deletions
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 4a909c3f5fd..0f0cca3d94b 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -43,6 +43,7 @@
43When set to nil no code will be evaluated as part of the export 43When set to nil no code will be evaluated as part of the export
44process." 44process."
45 :group 'org-babel 45 :group 'org-babel
46 :version "24.1"
46 :type 'boolean) 47 :type 'boolean)
47(put 'org-export-babel-evaluate 'safe-local-variable (lambda (x) (eq x nil))) 48(put 'org-export-babel-evaluate 'safe-local-variable (lambda (x) (eq x nil)))
48 49
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index e9c3dbb4f44..20cad4e6b40 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -55,6 +55,7 @@
55(defcustom org-babel-js-cmd "node" 55(defcustom org-babel-js-cmd "node"
56 "Name of command used to evaluate js blocks." 56 "Name of command used to evaluate js blocks."
57 :group 'org-babel 57 :group 'org-babel
58 :version "24.1"
58 :type 'string) 59 :type 'string)
59 60
60(defvar org-babel-js-function-wrapper 61(defvar org-babel-js-function-wrapper
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 3a6020d9efc..8fb67219692 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -49,6 +49,7 @@
49For example a value of \"(progn ;; %s\\n %%s)\" would ignore the 49For example a value of \"(progn ;; %s\\n %%s)\" would ignore the
50current directory string." 50current directory string."
51 :group 'org-babel 51 :group 'org-babel
52 :version "24.1"
52 :type 'string) 53 :type 'string)
53 54
54(defun org-babel-expand-body:lisp (body params) 55(defun org-babel-expand-body:lisp (body params)
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index d5595bbf595..7828f1d51c2 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -39,6 +39,7 @@ files to `org-babel-lob-files'.")
39 "Files used to populate the `org-babel-library-of-babel'. 39 "Files used to populate the `org-babel-library-of-babel'.
40To add files to this list use the `org-babel-lob-ingest' command." 40To add files to this list use the `org-babel-lob-ingest' command."
41 :group 'org-babel 41 :group 'org-babel
42 :version "24.1"
42 :type 'list) 43 :type 'list)
43 44
44(defvar org-babel-default-lob-header-args '((:exports . "results")) 45(defvar org-babel-default-lob-header-args '((:exports . "results"))
diff --git a/lisp/org/ob-picolisp.el b/lisp/org/ob-picolisp.el
index 291c0929f9b..06c9ab8df60 100644
--- a/lisp/org/ob-picolisp.el
+++ b/lisp/org/ob-picolisp.el
@@ -76,6 +76,7 @@
76(defcustom org-babel-picolisp-cmd "pil" 76(defcustom org-babel-picolisp-cmd "pil"
77 "Name of command used to evaluate picolisp blocks." 77 "Name of command used to evaluate picolisp blocks."
78 :group 'org-babel 78 :group 'org-babel
79 :version "24.1"
79 :type 'string) 80 :type 'string)
80 81
81(defun org-babel-expand-body:picolisp (body params &optional processed-params) 82(defun org-babel-expand-body:picolisp (body params &optional processed-params)
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index da700527f71..55729eb4172 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -44,6 +44,7 @@
44(defcustom org-plantuml-jar-path nil 44(defcustom org-plantuml-jar-path nil
45 "Path to the plantuml.jar file." 45 "Path to the plantuml.jar file."
46 :group 'org-babel 46 :group 'org-babel
47 :version "24.1"
47 :type 'string) 48 :type 'string)
48 49
49(defun org-babel-execute:plantuml (body params) 50(defun org-babel-execute:plantuml (body params)
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index 211acaa69ce..ce2992840ca 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -54,6 +54,7 @@
54(defcustom org-babel-scheme-cmd "guile" 54(defcustom org-babel-scheme-cmd "guile"
55 "Name of command used to evaluate scheme blocks." 55 "Name of command used to evaluate scheme blocks."
56 :group 'org-babel 56 :group 'org-babel
57 :version "24.1"
57 :type 'string) 58 :type 'string)
58 59
59(defun org-babel-expand-body:scheme (body params) 60(defun org-babel-expand-body:scheme (body params)
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index 5e498ab6c0c..db4721b70bc 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -47,6 +47,7 @@ be inserted as the extension commonly used to identify files
47written in this language. If no entry is found in this list, 47written in this language. If no entry is found in this list,
48then the name of the language is used." 48then the name of the language is used."
49 :group 'org-babel-tangle 49 :group 'org-babel-tangle
50 :version "24.1"
50 :type '(repeat 51 :type '(repeat
51 (cons 52 (cons
52 (string "Language name") 53 (string "Language name")
@@ -55,16 +56,19 @@ then the name of the language is used."
55(defcustom org-babel-post-tangle-hook nil 56(defcustom org-babel-post-tangle-hook nil
56 "Hook run in code files tangled by `org-babel-tangle'." 57 "Hook run in code files tangled by `org-babel-tangle'."
57 :group 'org-babel 58 :group 'org-babel
59 :version "24.1"
58 :type 'hook) 60 :type 'hook)
59 61
60(defcustom org-babel-pre-tangle-hook '(save-buffer) 62(defcustom org-babel-pre-tangle-hook '(save-buffer)
61 "Hook run at the beginning of `org-babel-tangle'." 63 "Hook run at the beginning of `org-babel-tangle'."
62 :group 'org-babel 64 :group 'org-babel
65 :version "24.1"
63 :type 'hook) 66 :type 'hook)
64 67
65(defcustom org-babel-tangle-body-hook nil 68(defcustom org-babel-tangle-body-hook nil
66 "Hook run over the contents of each code block body." 69 "Hook run over the contents of each code block body."
67 :group 'org-babel 70 :group 'org-babel
71 :version "24.1"
68 :type 'hook) 72 :type 'hook)
69 73
70(defcustom org-babel-tangle-comment-format-beg "[[%link][%source-name]]" 74(defcustom org-babel-tangle-comment-format-beg "[[%link][%source-name]]"
@@ -79,6 +83,7 @@ information into the output using `org-fill-template'.
79Whether or not comments are inserted during tangling is 83Whether or not comments are inserted during tangling is
80controlled by the :comments header argument." 84controlled by the :comments header argument."
81 :group 'org-babel 85 :group 'org-babel
86 :version "24.1"
82 :type 'string) 87 :type 'string)
83 88
84(defcustom org-babel-tangle-comment-format-end "%source-name ends here" 89(defcustom org-babel-tangle-comment-format-end "%source-name ends here"
@@ -93,6 +98,7 @@ information into the output using `org-fill-template'.
93Whether or not comments are inserted during tangling is 98Whether or not comments are inserted during tangling is
94controlled by the :comments header argument." 99controlled by the :comments header argument."
95 :group 'org-babel 100 :group 'org-babel
101 :version "24.1"
96 :type 'string) 102 :type 'string)
97 103
98(defcustom org-babel-process-comment-text #'org-babel-trim 104(defcustom org-babel-process-comment-text #'org-babel-trim
@@ -101,6 +107,7 @@ inserted as comments in tangled source-code files. The function
101should take a single string argument and return a string 107should take a single string argument and return a string
102result. The default value is `org-babel-trim'." 108result. The default value is `org-babel-trim'."
103 :group 'org-babel 109 :group 'org-babel
110 :version "24.1"
104 :type 'function) 111 :type 'function)
105 112
106(defun org-babel-find-file-noselect-refresh (file) 113(defun org-babel-find-file-noselect-refresh (file)
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 79ffe732e2b..ac6de9f1bbf 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -105,6 +105,7 @@ against accidental code block evaluation. The
105`org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to 105`org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to
106remove code block execution from the C-c C-c keybinding." 106remove code block execution from the C-c C-c keybinding."
107 :group 'org-babel 107 :group 'org-babel
108 :version "24.1"
108 :type '(choice boolean function)) 109 :type '(choice boolean function))
109;; don't allow this variable to be changed through file settings 110;; don't allow this variable to be changed through file settings
110(put 'org-confirm-babel-evaluate 'safe-local-variable (lambda (x) (eq x t))) 111(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."
112(defcustom org-babel-no-eval-on-ctrl-c-ctrl-c nil 113(defcustom org-babel-no-eval-on-ctrl-c-ctrl-c nil
113 "Remove code block evaluation from the C-c C-c key binding." 114 "Remove code block evaluation from the C-c C-c key binding."
114 :group 'org-babel 115 :group 'org-babel
116 :version "24.1"
115 :type 'boolean) 117 :type 'boolean)
116 118
117(defcustom org-babel-results-keyword "RESULTS" 119(defcustom org-babel-results-keyword "RESULTS"
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 81377cae818..324ddd27f9a 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -649,6 +649,7 @@ See also the variable `org-agenda-tags-todo-honor-ignore-options' if you want
649to make his option also apply to the tags-todo list." 649to make his option also apply to the tags-todo list."
650 :group 'org-agenda-skip 650 :group 'org-agenda-skip
651 :group 'org-agenda-todo-list 651 :group 'org-agenda-todo-list
652 :version "24.1"
652 :type '(choice 653 :type '(choice
653 (const :tag "Ignore future timestamp todos" future) 654 (const :tag "Ignore future timestamp todos" future)
654 (const :tag "Ignore past or present timestamp todos" past) 655 (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
796because you will take care of it on the day when scheduled." 797because you will take care of it on the day when scheduled."
797 :group 'org-agenda-skip 798 :group 'org-agenda-skip
798 :group 'org-agenda-daily/weekly 799 :group 'org-agenda-daily/weekly
800 :version "24.1"
799 :type '(choice 801 :type '(choice
800 (const :tag "Alwas show prewarning" nil) 802 (const :tag "Alwas show prewarning" nil)
801 (const :tag "Remove prewarning if entry is scheduled" t) 803 (const :tag "Remove prewarning if entry is scheduled" t)
@@ -860,6 +862,7 @@ property so than moving the mouse over the command shows it.
860Setting it to nil is good if matcher strings are very long and/or if 862Setting it to nil is good if matcher strings are very long and/or if
861you want to use two-column display (see `org-agenda-menu-two-column')." 863you want to use two-column display (see `org-agenda-menu-two-column')."
862 :group 'org-agenda 864 :group 'org-agenda
865 :version "24.1"
863 :type 'boolean) 866 :type 'boolean)
864 867
865(defcustom org-agenda-menu-two-column nil 868(defcustom org-agenda-menu-two-column nil
@@ -867,6 +870,7 @@ you want to use two-column display (see `org-agenda-menu-two-column')."
867If you use this, you probably want to set `org-agenda-menu-show-matcher' 870If you use this, you probably want to set `org-agenda-menu-show-matcher'
868to nil." 871to nil."
869 :group 'org-agenda 872 :group 'org-agenda
873 :version "24.1"
870 :type 'boolean) 874 :type 'boolean)
871 875
872(defcustom org-finalize-agenda-hook nil 876(defcustom org-finalize-agenda-hook nil
@@ -890,6 +894,7 @@ Needs to be set before org.el is loaded."
890 "Non-nil means `org-agenda-follow-mode' displays only the 894 "Non-nil means `org-agenda-follow-mode' displays only the
891current item's tree, in an indirect buffer." 895current item's tree, in an indirect buffer."
892 :group 'org-agenda 896 :group 'org-agenda
897 :version "24.1"
893 :type 'boolean) 898 :type 'boolean)
894 899
895(defcustom org-agenda-show-outline-path t 900(defcustom org-agenda-show-outline-path t
@@ -1042,11 +1047,13 @@ This function makes sure that dates are aligned for easy reading."
1042 "Non-nil means use leading zero for military times in agenda. 1047 "Non-nil means use leading zero for military times in agenda.
1043For example, 9:30am would become 09:30 rather than 9:30." 1048For example, 9:30am would become 09:30 rather than 9:30."
1044 :group 'org-agenda-daily/weekly 1049 :group 'org-agenda-daily/weekly
1050 :version "24.1"
1045 :type 'boolean) 1051 :type 'boolean)
1046 1052
1047(defcustom org-agenda-timegrid-use-ampm nil 1053(defcustom org-agenda-timegrid-use-ampm nil
1048 "When set, show AM/PM style timestamps on the timegrid." 1054 "When set, show AM/PM style timestamps on the timegrid."
1049 :group 'org-agenda 1055 :group 'org-agenda
1056 :version "24.1"
1050 :type 'boolean) 1057 :type 'boolean)
1051 1058
1052(defun org-agenda-time-of-day-to-ampm (time) 1059(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
1094to today. WHen nil, just move one day forward even if the date stays 1101to today. WHen nil, just move one day forward even if the date stays
1095in the past." 1102in the past."
1096 :group 'org-agenda-daily/weekly 1103 :group 'org-agenda-daily/weekly
1104 :version "24.1"
1097 :type 'boolean) 1105 :type 'boolean)
1098 1106
1099(defcustom org-agenda-include-diary nil 1107(defcustom org-agenda-include-diary nil
@@ -1106,6 +1114,7 @@ Custom commands can set this variable in the options section."
1106 "If non-nil, include entries within their deadline warning period. 1114 "If non-nil, include entries within their deadline warning period.
1107Custom commands can set this variable in the options section." 1115Custom commands can set this variable in the options section."
1108 :group 'org-agenda-daily/weekly 1116 :group 'org-agenda-daily/weekly
1117 :version "24.1"
1109 :type 'boolean) 1118 :type 'boolean)
1110 1119
1111(defcustom org-agenda-repeating-timestamp-show-all t 1120(defcustom org-agenda-repeating-timestamp-show-all t
@@ -1181,6 +1190,7 @@ issue display.
1181:short-face face for clock intervals that are too short" 1190:short-face face for clock intervals that are too short"
1182 :group 'org-agenda-daily/weekly 1191 :group 'org-agenda-daily/weekly
1183 :group 'org-clock 1192 :group 'org-clock
1193 :version "24.1"
1184 :type 'plist) 1194 :type 'plist)
1185 1195
1186(defcustom org-agenda-log-mode-add-notes t 1196(defcustom org-agenda-log-mode-add-notes t
@@ -1239,6 +1249,7 @@ by preceding the first snippet with \"+\" or \"-\". If the first snippet
1239is a regexp marked with braces like \"{abc}\", this will also switch to 1249is a regexp marked with braces like \"{abc}\", this will also switch to
1240boolean search." 1250boolean search."
1241 :group 'org-agenda-search-view 1251 :group 'org-agenda-search-view
1252 :version "24.1"
1242 :type 'boolean) 1253 :type 'boolean)
1243 1254
1244(if (fboundp 'defvaralias) 1255(if (fboundp 'defvaralias)
@@ -1249,6 +1260,7 @@ boolean search."
1249 "Non-nil means, search words must be matches as complete words. 1260 "Non-nil means, search words must be matches as complete words.
1250When nil, they may also match part of a word." 1261When nil, they may also match part of a word."
1251 :group 'org-agenda-search-view 1262 :group 'org-agenda-search-view
1263 :version "24.1"
1252 :type 'boolean) 1264 :type 'boolean)
1253 1265
1254(defgroup org-agenda-time-grid nil 1266(defgroup org-agenda-time-grid nil
@@ -1312,12 +1324,14 @@ a grid line."
1312(defcustom org-agenda-show-current-time-in-grid t 1324(defcustom org-agenda-show-current-time-in-grid t
1313 "Non-nil means show the current time in the time grid." 1325 "Non-nil means show the current time in the time grid."
1314 :group 'org-agenda-time-grid 1326 :group 'org-agenda-time-grid
1327 :version "24.1"
1315 :type 'boolean) 1328 :type 'boolean)
1316 1329
1317(defcustom org-agenda-current-time-string 1330(defcustom org-agenda-current-time-string
1318 "now - - - - - - - - - - - - - - - - - - - - - - - - -" 1331 "now - - - - - - - - - - - - - - - - - - - - - - - - -"
1319 "The string for the current time marker in the agenda." 1332 "The string for the current time marker in the agenda."
1320 :group 'org-agenda-time-grid 1333 :group 'org-agenda-time-grid
1334 :version "24.1"
1321 :type 'string) 1335 :type 'string)
1322 1336
1323(defgroup org-agenda-sorting nil 1337(defgroup org-agenda-sorting nil
@@ -1528,6 +1542,7 @@ that passed since this item was scheduled first."
1528 "Text preceding item pulled into the agenda by inactive time stamps. 1542 "Text preceding item pulled into the agenda by inactive time stamps.
1529These entries are added to the agenda when pressing \"[\"." 1543These entries are added to the agenda when pressing \"[\"."
1530 :group 'org-agenda-line-format 1544 :group 'org-agenda-line-format
1545 :version "24.1"
1531 :type '(list 1546 :type '(list
1532 (string :tag "Scheduled today ") 1547 (string :tag "Scheduled today ")
1533 (string :tag "Scheduled previously"))) 1548 (string :tag "Scheduled previously")))
@@ -1566,6 +1581,7 @@ the headline/diary entry."
1566 "Non-nil means remove time ranges specifications in agenda 1581 "Non-nil means remove time ranges specifications in agenda
1567items that span on several days." 1582items that span on several days."
1568 :group 'org-agenda-line-format 1583 :group 'org-agenda-line-format
1584 :version "24.1"
1569 :type 'boolean) 1585 :type 'boolean)
1570 1586
1571(defcustom org-agenda-default-appointment-duration nil 1587(defcustom org-agenda-default-appointment-duration nil
@@ -1647,6 +1663,7 @@ The only argument passed to that function is the day. It should
1647returns a face, or nil if does not want to specify a face and let 1663returns a face, or nil if does not want to specify a face and let
1648the normal rules apply." 1664the normal rules apply."
1649 :group 'org-agenda-line-format 1665 :group 'org-agenda-line-format
1666 :version "24.1"
1650 :type 'function) 1667 :type 'function)
1651 1668
1652(defcustom org-agenda-category-icon-alist nil 1669(defcustom org-agenda-category-icon-alist nil
@@ -1679,6 +1696,7 @@ category, you can use:
1679 1696
1680 (\"Emacs\" '(space . (:width (16))))" 1697 (\"Emacs\" '(space . (:width (16))))"
1681 :group 'org-agenda-line-format 1698 :group 'org-agenda-line-format
1699 :version "24.1"
1682 :type '(alist :key-type (string :tag "Regexp matching category") 1700 :type '(alist :key-type (string :tag "Regexp matching category")
1683 :value-type (choice (list :tag "Icon" 1701 :value-type (choice (list :tag "Icon"
1684 (string :tag "File or data") 1702 (string :tag "File or data")
@@ -1741,6 +1759,7 @@ With selected entries in an agenda buffer, `B R' will call
1741the custom function `set-category' on the selected entries. 1759the custom function `set-category' on the selected entries.
1742Note that functions in this alist don't need to be quoted." 1760Note that functions in this alist don't need to be quoted."
1743 :type 'alist 1761 :type 'alist
1762 :version "24.1"
1744 :group 'org-agenda) 1763 :group 'org-agenda)
1745 1764
1746(eval-when-compile 1765(eval-when-compile
@@ -7998,6 +8017,7 @@ top-level as top-level entries at the end of the file."
7998(defcustom org-agenda-insert-diary-extract-time nil 8017(defcustom org-agenda-insert-diary-extract-time nil
7999 "Non-nil means extract any time specification from the diary entry." 8018 "Non-nil means extract any time specification from the diary entry."
8000 :group 'org-agenda 8019 :group 'org-agenda
8020 :version "24.1"
8001 :type 'boolean) 8021 :type 'boolean)
8002 8022
8003(defun org-agenda-add-entry-to-org-agenda-diary-file (type text &optional d1 d2) 8023(defun org-agenda-add-entry-to-org-agenda-diary-file (type text &optional d1 d2)
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 4137e2caf2b..db3b8250bc0 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -43,6 +43,7 @@
43(defcustom org-archive-reversed-order nil 43(defcustom org-archive-reversed-order nil
44 "Non-nil means make the tree first child under the archive heading, not last." 44 "Non-nil means make the tree first child under the archive heading, not last."
45 :group 'org-archive 45 :group 'org-archive
46 :version "24.1"
46 :type 'boolean) 47 :type 'boolean)
47 48
48(defcustom org-archive-sibling-heading "Archive" 49(defcustom org-archive-sibling-heading "Archive"
@@ -72,6 +73,7 @@ This variable is obsolete and has no effect anymore, instead add or remove
72(defcustom org-archive-subtree-add-inherited-tags 'infile 73(defcustom org-archive-subtree-add-inherited-tags 'infile
73 "Non-nil means append inherited tags when archiving a subtree." 74 "Non-nil means append inherited tags when archiving a subtree."
74 :group 'org-archive 75 :group 'org-archive
76 :version "24.1"
75 :type '(choice 77 :type '(choice
76 (const :tag "Never" nil) 78 (const :tag "Never" nil)
77 (const :tag "When archiving a subtree to the same file" infile) 79 (const :tag "When archiving a subtree to the same file" infile)
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 6881940f131..a87993f4b2e 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -101,6 +101,7 @@ ln create a hard link. Note that this is not supported
101(defcustom org-attach-store-link-p nil 101(defcustom org-attach-store-link-p nil
102 "Non-nil means store a link to a file when attaching it." 102 "Non-nil means store a link to a file when attaching it."
103 :group 'org-attach 103 :group 'org-attach
104 :version "24.1"
104 :type '(choice 105 :type '(choice
105 (const :tag "Don't store link" nil) 106 (const :tag "Don't store link" nil)
106 (const :tag "Link to origin location" t) 107 (const :tag "Link to origin location" t)
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index eee1af4dd6e..041a9154095 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -43,6 +43,7 @@
43(defcustom org-beamer-use-parts nil 43(defcustom org-beamer-use-parts nil
44 "" 44 ""
45 :group 'org-beamer 45 :group 'org-beamer
46 :version "24.1"
46 :type 'boolean) 47 :type 'boolean)
47 48
48(defcustom org-beamer-frame-level 1 49(defcustom org-beamer-frame-level 1
@@ -52,6 +53,7 @@ Setting this to 2 will allow sections, 3 will allow subsections as well.
52You can set this to 4 as well, if you at the same time set 53You can set this to 4 as well, if you at the same time set
53`org-beamer-use-parts' to make the top levels `\part'." 54`org-beamer-use-parts' to make the top levels `\part'."
54 :group 'org-beamer 55 :group 'org-beamer
56 :version "24.1"
55 :type '(choice 57 :type '(choice
56 (const :tag "Frames need a BEAMER_env property" nil) 58 (const :tag "Frames need a BEAMER_env property" nil)
57 (integer :tag "Specific level makes a frame"))) 59 (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
60 "Default options string to use for frames, should contains the [brackets]. 62 "Default options string to use for frames, should contains the [brackets].
61And example for this is \"[allowframebreaks]\"." 63And example for this is \"[allowframebreaks]\"."
62 :group 'org-beamer 64 :group 'org-beamer
65 :version "24.1"
63 :type '(string :tag "[options]")) 66 :type '(string :tag "[options]"))
64 67
65(defcustom org-beamer-column-view-format 68(defcustom org-beamer-column-view-format
66 "%45ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra)" 69 "%45ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra)"
67 "Default column view format that should be used to fill the template." 70 "Default column view format that should be used to fill the template."
68 :group 'org-beamer 71 :group 'org-beamer
72 :version "24.1"
69 :type '(choice 73 :type '(choice
70 (const :tag "Do not insert Beamer column view format" nil) 74 (const :tag "Do not insert Beamer column view format" nil)
71 (string :tag "Beamer column view format"))) 75 (string :tag "Beamer column view format")))
@@ -76,6 +80,7 @@ And example for this is \"[allowframebreaks]\"."
76When a beamer template is filled, this will be the default for 80When a beamer template is filled, this will be the default for
77BEAMER_HEADER_EXTRA, which will be inserted just before \\begin{document}." 81BEAMER_HEADER_EXTRA, which will be inserted just before \\begin{document}."
78 :group 'org-beamer 82 :group 'org-beamer
83 :version "24.1"
79 :type '(choice 84 :type '(choice
80 (const :tag "Do not insert Beamer themes" nil) 85 (const :tag "Do not insert Beamer themes" nil)
81 (string :tag "Beamer themes"))) 86 (string :tag "Beamer themes")))
@@ -142,6 +147,7 @@ open The opening template for the environment, with the following escapes
142close The closing string of the environment." 147close The closing string of the environment."
143 148
144 :group 'org-beamer 149 :group 'org-beamer
150 :version "24.1"
145 :type '(repeat 151 :type '(repeat
146 (list 152 (list
147 (string :tag "Environment") 153 (string :tag "Environment")
@@ -402,6 +408,7 @@ the value will be inserted right after the documentclass statement."
402(defcustom org-beamer-fragile-re "\\\\\\(verb\\|lstinline\\)\\|^[ \t]*\\\\begin{\\(verbatim\\|lstlisting\\|minted\\)}" 408(defcustom org-beamer-fragile-re "\\\\\\(verb\\|lstinline\\)\\|^[ \t]*\\\\begin{\\(verbatim\\|lstlisting\\|minted\\)}"
403 "If this regexp matches in a frame, the frame is marked as fragile." 409 "If this regexp matches in a frame, the frame is marked as fragile."
404 :group 'org-beamer 410 :group 'org-beamer
411 :version "24.1"
405 :type 'regexp) 412 :type 'regexp)
406 413
407(defface org-beamer-tag '((t (:box (:line-width 1 :color grey40)))) 414(defface org-beamer-tag '((t (:box (:line-width 1 :color grey40))))
@@ -511,6 +518,7 @@ This function will run in the final LaTeX document."
511(defcustom org-beamer-outline-frame-title "Outline" 518(defcustom org-beamer-outline-frame-title "Outline"
512 "Default title of a frame containing an outline." 519 "Default title of a frame containing an outline."
513 :group 'org-beamer 520 :group 'org-beamer
521 :version "24.1"
514 :type '(string :tag "Outline frame title") 522 :type '(string :tag "Outline frame title")
515) 523)
516 524
@@ -519,6 +527,7 @@ This function will run in the final LaTeX document."
519You might want to put e.g. [allowframebreaks=0.9] here. Remember to 527You might want to put e.g. [allowframebreaks=0.9] here. Remember to
520include square brackets." 528include square brackets."
521 :group 'org-beamer 529 :group 'org-beamer
530 :version "24.1"
522 :type '(string :tag "Outline frame options") 531 :type '(string :tag "Outline frame options")
523) 532)
524 533
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index fc0686035d7..21e36a7c187 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -216,12 +216,14 @@
216(defcustom org-bibtex-autogen-keys nil 216(defcustom org-bibtex-autogen-keys nil
217 "Set to a truth value to use `bibtex-generate-autokey' to generate keys." 217 "Set to a truth value to use `bibtex-generate-autokey' to generate keys."
218 :group 'org-bibtex 218 :group 'org-bibtex
219 :version "24.1"
219 :type 'boolean) 220 :type 'boolean)
220 221
221(defcustom org-bibtex-prefix nil 222(defcustom org-bibtex-prefix nil
222 "Optional prefix for all bibtex property names. 223 "Optional prefix for all bibtex property names.
223For example setting to 'BIB_' would allow interoperability with fireforg." 224For example setting to 'BIB_' would allow interoperability with fireforg."
224 :group 'org-bibtex 225 :group 'org-bibtex
226 :version "24.1"
225 :type 'string) 227 :type 'string)
226 228
227(defcustom org-bibtex-treat-headline-as-title t 229(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
230the property. If this value is t, `org-bibtex-check' will ignore 232the property. If this value is t, `org-bibtex-check' will ignore
231a missing title field." 233a missing title field."
232 :group 'org-bibtex 234 :group 'org-bibtex
235 :version "24.1"
233 :type 'boolean) 236 :type 'boolean)
234 237
235(defcustom org-bibtex-export-arbitrary-fields nil 238(defcustom org-bibtex-export-arbitrary-fields nil
@@ -238,6 +241,7 @@ This only has effect if `org-bibtex-prefix' is defined, so as to
238ensure that other org-properties, such as CATEGORY or LOGGING are 241ensure that other org-properties, such as CATEGORY or LOGGING are
239not placed in the exported bibtex entry." 242not placed in the exported bibtex entry."
240 :group 'org-bibtex 243 :group 'org-bibtex
244 :version "24.1"
241 :type 'boolean) 245 :type 'boolean)
242 246
243(defcustom org-bibtex-key-property "CUSTOM_ID" 247(defcustom org-bibtex-key-property "CUSTOM_ID"
@@ -247,11 +251,13 @@ bibtex headlines from within an org file. This can be set to ID
247to enable global links, but only with great caution, as global 251to enable global links, but only with great caution, as global
248IDs must be unique." 252IDs must be unique."
249 :group 'org-bibtex 253 :group 'org-bibtex
254 :version "24.1"
250 :type 'string) 255 :type 'string)
251 256
252(defcustom org-bibtex-tags nil 257(defcustom org-bibtex-tags nil
253 "List of tag(s) that should be added to new bib entries." 258 "List of tag(s) that should be added to new bib entries."
254 :group 'org-bibtex 259 :group 'org-bibtex
260 :version "24.1"
255 :type '(repeat :tag "Tag" (string))) 261 :type '(repeat :tag "Tag" (string)))
256 262
257(defcustom org-bibtex-tags-are-keywords nil 263(defcustom org-bibtex-tags-are-keywords nil
@@ -266,17 +272,20 @@ comma-separated string of keywords when exported to bibtex. Tags
266defined in `org-bibtex-tags' or `org-bibtex-no-export-tags' will 272defined in `org-bibtex-tags' or `org-bibtex-no-export-tags' will
267not be exported." 273not be exported."
268 :group 'org-bibtex 274 :group 'org-bibtex
275 :version "24.1"
269 :type 'boolean) 276 :type 'boolean)
270 277
271(defcustom org-bibtex-no-export-tags nil 278(defcustom org-bibtex-no-export-tags nil
272 "List of tag(s) that should not be converted to keywords. 279 "List of tag(s) that should not be converted to keywords.
273This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t." 280This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t."
274 :group 'org-bibtex 281 :group 'org-bibtex
282 :version "24.1"
275 :type '(repeat :tag "Tag" (string))) 283 :type '(repeat :tag "Tag" (string)))
276 284
277(defcustom org-bibtex-type-property-name "btype" 285(defcustom org-bibtex-type-property-name "btype"
278 "Property in which to store bibtex entry type (e.g., article)." 286 "Property in which to store bibtex entry type (e.g., article)."
279 :group 'org-bibtex 287 :group 'org-bibtex
288 :version "24.1"
280 :type 'string) 289 :type 'string)
281 290
282 291
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 775606b4cfb..454463f7086 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -262,6 +262,7 @@ w3, w3m | %:type %:url
262info | %:type %:file %:node 262info | %:type %:file %:node
263calendar | %:type %:date" 263calendar | %:type %:date"
264 :group 'org-capture 264 :group 'org-capture
265 :version "24.1"
265 :type 266 :type
266 '(repeat 267 '(repeat
267 (choice :value ("" "" entry (file "~/org/notes.org") "") 268 (choice :value ("" "" entry (file "~/org/notes.org") "")
@@ -336,12 +337,14 @@ calendar | %:type %:date"
336The capture buffer is still current when this hook runs and it is 337The capture buffer is still current when this hook runs and it is
337widened to the entire buffer." 338widened to the entire buffer."
338 :group 'org-capture 339 :group 'org-capture
340 :version "24.1"
339 :type 'hook) 341 :type 'hook)
340 342
341(defcustom org-capture-after-finalize-hook nil 343(defcustom org-capture-after-finalize-hook nil
342 "Hook that is run right after a capture process is finalized. 344 "Hook that is run right after a capture process is finalized.
343 Suitable for window cleanup" 345 Suitable for window cleanup"
344 :group 'org-capture 346 :group 'org-capture
347 :version "24.1"
345 :type 'hook) 348 :type 'hook)
346 349
347;;; The property list for keeping information about the capture process 350;;; The property list for keeping information about the capture process
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index cdf4a1aa66c..7105bfe13dc 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -226,6 +226,7 @@ should get a different face (`org-mode-line-clock-overrun').
226When this is a string, it is prepended to the clock string as an indication, 226When this is a string, it is prepended to the clock string as an indication,
227also using the face `org-mode-line-clock-overrun'." 227also using the face `org-mode-line-clock-overrun'."
228 :group 'org-clock 228 :group 'org-clock
229 :version "24.1"
229 :type '(choice 230 :type '(choice
230 (const :tag "Just mark the time string" nil) 231 (const :tag "Just mark the time string" nil)
231 (string :tag "Text to prepend"))) 232 (string :tag "Text to prepend")))
@@ -267,12 +268,14 @@ string as argument."
267 :formatter nil) 268 :formatter nil)
268 "Default properties for clock tables." 269 "Default properties for clock tables."
269 :group 'org-clock 270 :group 'org-clock
271 :version "24.1"
270 :type 'plist) 272 :type 'plist)
271 273
272(defcustom org-clock-clocktable-formatter 'org-clocktable-write-default 274(defcustom org-clock-clocktable-formatter 'org-clocktable-write-default
273 "Function to turn clocking data into a table. 275 "Function to turn clocking data into a table.
274For more information, see `org-clocktable-write-default'." 276For more information, see `org-clocktable-write-default'."
275 :group 'org-clocktable 277 :group 'org-clocktable
278 :version "24.1"
276 :type 'function) 279 :type 'function)
277 280
278;; FIXME: translate es and nl last string "Clock summary at" 281;; FIXME: translate es and nl last string "Clock summary at"
@@ -283,6 +286,7 @@ For more information, see `org-clocktable-write-default'."
283 ("nl" "Bestand" "N" "Tijdstip" "Hoofding" "Duur" "ALLES" "Totale duur" "Bestandstijd" "Clock summary at")) 286 ("nl" "Bestand" "N" "Tijdstip" "Hoofding" "Duur" "ALLES" "Totale duur" "Bestandstijd" "Clock summary at"))
284 "Terms used in clocktable, translated to different languages." 287 "Terms used in clocktable, translated to different languages."
285 :group 'org-clocktable 288 :group 'org-clocktable
289 :version "24.1"
286 :type 'alist) 290 :type 'alist)
287 291
288(defcustom org-clock-clocktable-default-properties '(:maxlevel 2 :scope file) 292(defcustom org-clock-clocktable-default-properties '(:maxlevel 2 :scope file)
@@ -310,11 +314,13 @@ play with them."
310(defcustom org-clock-report-include-clocking-task nil 314(defcustom org-clock-report-include-clocking-task nil
311 "When non-nil, include the current clocking task time in clock reports." 315 "When non-nil, include the current clocking task time in clock reports."
312 :group 'org-clock 316 :group 'org-clock
317 :version "24.1"
313 :type 'boolean) 318 :type 'boolean)
314 319
315(defcustom org-clock-resolve-expert nil 320(defcustom org-clock-resolve-expert nil
316 "Non-nil means do not show the splash buffer with the clock resolver." 321 "Non-nil means do not show the splash buffer with the clock resolver."
317 :group 'org-clock 322 :group 'org-clock
323 :version "24.1"
318 :type 'boolean) 324 :type 'boolean)
319 325
320(defvar org-clock-in-prepare-hook nil 326(defvar org-clock-in-prepare-hook nil
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index ea94d419957..48656190a0c 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -162,6 +162,7 @@ See the ctags documentation for more information.")
162 (t "ctags-exuberant")) 162 (t "ctags-exuberant"))
163 "Full path to the ctags executable file." 163 "Full path to the ctags executable file."
164 :group 'org-ctags 164 :group 'org-ctags
165 :version "24.1"
165 :type 'file) 166 :type 'file)
166 167
167(defcustom org-ctags-open-link-functions 168(defcustom org-ctags-open-link-functions
@@ -170,6 +171,7 @@ See the ctags documentation for more information.")
170 org-ctags-ask-append-topic) 171 org-ctags-ask-append-topic)
171 "List of functions to be prepended to ORG-OPEN-LINK-FUNCTIONS when ORG-CTAGS is active." 172 "List of functions to be prepended to ORG-OPEN-LINK-FUNCTIONS when ORG-CTAGS is active."
172 :group 'org-ctags 173 :group 'org-ctags
174 :version "24.1"
173 :type 'hook 175 :type 'hook
174 :options '(org-ctags-find-tag 176 :options '(org-ctags-find-tag
175 org-ctags-ask-rebuild-tags-file-then-find-tag 177 org-ctags-ask-rebuild-tags-file-then-find-tag
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index 8c0bcd784ff..c3fd62c1fe2 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -150,6 +150,7 @@ avoid same set of footnote IDs being used multiple times."
150(defcustom org-export-docbook-footnote-separator "<superscript>, </superscript>" 150(defcustom org-export-docbook-footnote-separator "<superscript>, </superscript>"
151 "Text used to separate footnotes." 151 "Text used to separate footnotes."
152 :group 'org-export-docbook 152 :group 'org-export-docbook
153 :version "24.1"
153 :type 'string) 154 :type 'string)
154 155
155(defcustom org-export-docbook-emphasis-alist 156(defcustom org-export-docbook-emphasis-alist
@@ -195,6 +196,7 @@ This XSLT stylesheet is used by
195Object (FO) files. You can use either `fo/docbook.xsl' that 196Object (FO) files. You can use either `fo/docbook.xsl' that
196comes with DocBook, or any customization layer you may have." 197comes with DocBook, or any customization layer you may have."
197 :group 'org-export-docbook 198 :group 'org-export-docbook
199 :version "24.1"
198 :type 'string) 200 :type 'string)
199 201
200(defcustom org-export-docbook-xslt-proc-command nil 202(defcustom org-export-docbook-xslt-proc-command nil
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index fe3c52892a1..8b5b3f312e4 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -44,6 +44,7 @@
44For example, this will replace \"\\nsup\" with \"[not a superset of]\" 44For example, this will replace \"\\nsup\" with \"[not a superset of]\"
45in backends where the corresponding character is not available." 45in backends where the corresponding character is not available."
46 :group 'org-entities 46 :group 'org-entities
47 :version "24.1"
47 :type 'boolean) 48 :type 'boolean)
48 49
49(defcustom org-entities-user nil 50(defcustom org-entities-user nil
@@ -68,6 +69,7 @@ utf-8 replacement Use the special characters available in utf-8.
68If you define new entities here that require specific LaTeX packages to be 69If you define new entities here that require specific LaTeX packages to be
69loaded, add these packages to `org-export-latex-packages-alist'." 70loaded, add these packages to `org-export-latex-packages-alist'."
70 :group 'org-entities 71 :group 'org-entities
72 :version "24.1"
71 :type '(repeat 73 :type '(repeat
72 (list 74 (list
73 (string :tag "name ") 75 (string :tag "name ")
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 438a580d8b5..7d466cec65d 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -136,6 +136,7 @@ export function should accept three arguments."
136(defcustom org-export-blocks-postblock-hook nil 136(defcustom org-export-blocks-postblock-hook nil
137 "Run after blocks have been processed with `org-export-blocks-preprocess'." 137 "Run after blocks have been processed with `org-export-blocks-preprocess'."
138 :group 'org-export-general 138 :group 'org-export-general
139 :version "24.1"
139 :type 'hook) 140 :type 'hook)
140 141
141(defun org-export-blocks-html-quote (body &optional open close) 142(defun org-export-blocks-html-quote (body &optional open close)
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index b5901a54bc5..174619a3b8f 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -98,6 +98,7 @@ is nil, the buffer remains buried also in these cases."
98This applied to the commands `org-export-as-html-and-open' and 98This applied to the commands `org-export-as-html-and-open' and
99`org-export-as-pdf-and-open'." 99`org-export-as-pdf-and-open'."
100 :group 'org-export-general 100 :group 'org-export-general
101 :version "24.1"
101 :type 'boolean) 102 :type 'boolean)
102 103
103(defcustom org-export-run-in-background nil 104(defcustom org-export-run-in-background nil
@@ -120,6 +121,7 @@ force an export command into the current process."
120 "The initial scope when exporting with `org-export'. 121 "The initial scope when exporting with `org-export'.
121This variable can be either set to 'buffer or 'subtree." 122This variable can be either set to 'buffer or 'subtree."
122 :group 'org-export-general 123 :group 'org-export-general
124 :version "24.1"
123 :type '(choice 125 :type '(choice
124 (const :tag "Export current buffer" 'buffer) 126 (const :tag "Export current buffer" 'buffer)
125 (const :tag "Export current subtree" 'subtree))) 127 (const :tag "Export current subtree" 'subtree)))
@@ -220,6 +222,7 @@ and in `org-clock-clocktable-language-setup'."
220(defcustom org-export-date-timestamp-format "%Y-%m-%d" 222(defcustom org-export-date-timestamp-format "%Y-%m-%d"
221 "Time string format for Org timestamps in the #+DATE option." 223 "Time string format for Org timestamps in the #+DATE option."
222 :group 'org-export-general 224 :group 'org-export-general
225 :version "24.1"
223 :type 'string) 226 :type 'string)
224 227
225(defvar org-export-page-description "" 228(defvar org-export-page-description ""
@@ -317,6 +320,7 @@ done include only tasks that are already done.
317nil remove all tasks before export 320nil remove all tasks before export
318list of TODO kwds keep only tasks with these keywords" 321list of TODO kwds keep only tasks with these keywords"
319 :group 'org-export-general 322 :group 'org-export-general
323 :version "24.1"
320 :type '(choice 324 :type '(choice
321 (const :tag "All tasks" t) 325 (const :tag "All tasks" t)
322 (const :tag "No tasks" nil) 326 (const :tag "No tasks" nil)
@@ -367,6 +371,7 @@ e.g. \"author:nil\"."
367This option can also be set with the +OPTIONS line, 371This option can also be set with the +OPTIONS line,
368e.g. \"email:t\"." 372e.g. \"email:t\"."
369 :group 'org-export-general 373 :group 'org-export-general
374 :version "24.1"
370 :type 'boolean) 375 :type 'boolean)
371 376
372(defcustom org-export-creator-info t 377(defcustom org-export-creator-info t
@@ -594,6 +599,7 @@ the values of constants may be useful to have."
594This is the global equivalent of the :remove-nil-lines option 599This is the global equivalent of the :remove-nil-lines option
595when locally sending a table with #+ORGTBL." 600when locally sending a table with #+ORGTBL."
596 :group 'org-export-tables 601 :group 'org-export-tables
602 :version "24.1"
597 :type 'boolean) 603 :type 'boolean)
598 604
599(defcustom org-export-prefer-native-exporter-for-tables nil 605(defcustom org-export-prefer-native-exporter-for-tables nil
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index e71ce2322ae..481d662eca1 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -351,6 +351,7 @@ keywords will then be interpreted as either foreground or background
351color." 351color."
352 :group 'org-faces 352 :group 'org-faces
353 :group 'org-todo 353 :group 'org-todo
354 :version "24.1"
354 :type '(repeat 355 :type '(repeat
355 (cons (choice (const todo) (const tag) (const priority)) 356 (cons (choice (const todo) (const tag) (const priority))
356 (choice (const :foreground) (const :background))))) 357 (choice (const :foreground) (const :background)))))
@@ -547,6 +548,7 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword."
547When nil, format these as normal Org. This is the default, because the 548When nil, format these as normal Org. This is the default, because the
548content of these blocks will still be treated as Org syntax." 549content of these blocks will still be treated as Org syntax."
549 :group 'org-faces 550 :group 'org-faces
551 :version "24.1"
550 :type 'boolean) 552 :type 'boolean)
551 553
552(defface org-clock-overlay ;; copied from secondary-selection 554(defface org-clock-overlay ;; copied from secondary-selection
@@ -732,6 +734,7 @@ If nil, then all levels >=org-n-level-faces are styled like
732level org-n-level-faces" 734level org-n-level-faces"
733 :group 'org-appearance 735 :group 'org-appearance
734 :group 'org-faces 736 :group 'org-faces
737 :version "24.1"
735 :type 'boolean) 738 :type 'boolean)
736 739
737(defface org-latex-and-export-specials 740(defface org-latex-and-export-specials
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 8b774007206..3b94d928945 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -414,6 +414,7 @@ MATCHED is the link just matched."
414 ;; with this setting now, but not before??? Was this perhaps a java 414 ;; with this setting now, but not before??? Was this perhaps a java
415 ;; bug or is it a windows xp bug (some resource gets exhausted if you 415 ;; bug or is it a windows xp bug (some resource gets exhausted if you
416 ;; use sticky keys which I do). 416 ;; use sticky keys which I do).
417 :version "24.1"
417 :group 'org-freemind) 418 :group 'org-freemind)
418 419
419(defun org-freemind-org-text-to-freemind-subnode/note (node-name start end drawers-regexp) 420(defun org-freemind-org-text-to-freemind-subnode/note (node-name start end drawers-regexp)
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index f0c64a0d765..5b855c291f0 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -62,6 +62,7 @@ configured) IMAP servers don't support this operation quickly.
62So if following a link to a Gnus article takes ages, try setting 62So if following a link to a Gnus article takes ages, try setting
63this variable to `t'." 63this variable to `t'."
64 :group 'org-link-store 64 :group 'org-link-store
65 :version "24.1"
65 :type 'boolean) 66 :type 'boolean)
66 67
67 68
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index d019f3aeae6..6b4776662e2 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -70,11 +70,13 @@ relative to the current effective date."
70(defcustom org-habit-today-glyph ?! 70(defcustom org-habit-today-glyph ?!
71 "Glyph character used to identify today." 71 "Glyph character used to identify today."
72 :group 'org-habit 72 :group 'org-habit
73 :version "24.1"
73 :type 'character) 74 :type 'character)
74 75
75(defcustom org-habit-completed-glyph ?* 76(defcustom org-habit-completed-glyph ?*
76 "Glyph character used to show completed days on which a task was done." 77 "Glyph character used to show completed days on which a task was done."
77 :group 'org-habit 78 :group 'org-habit
79 :version "24.1"
78 :type 'character) 80 :type 'character)
79 81
80(defface org-habit-clear-face 82(defface org-habit-clear-face
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 69d88fe7e76..5cecc44a2df 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -64,6 +64,7 @@ by the footnotes themselves."
64(defcustom org-export-html-footnote-separator "<sup>, </sup>" 64(defcustom org-export-html-footnote-separator "<sup>, </sup>"
65 "Text used to separate footnotes." 65 "Text used to separate footnotes."
66 :group 'org-export-html 66 :group 'org-export-html
67 :version "24.1"
67 :type 'string) 68 :type 'string)
68 69
69(defcustom org-export-html-coding-system nil 70(defcustom org-export-html-coding-system nil
@@ -252,6 +253,7 @@ You can also customize this for each buffer, using something like
252 253
253#+MATHJAX: scale:\"133\" align:\"right\" mathml:t path:\"/MathJax/\"" 254#+MATHJAX: scale:\"133\" align:\"right\" mathml:t path:\"/MathJax/\""
254 :group 'org-export-html 255 :group 'org-export-html
256 :version "24.1"
255 :type '(list :greedy t 257 :type '(list :greedy t
256 (list :tag "path (the path from where to load MathJax.js)" 258 (list :tag "path (the path from where to load MathJax.js)"
257 (const :format " " path) (string)) 259 (const :format " " path) (string))
@@ -335,6 +337,7 @@ You can also customize this for each buffer, using something like
335</script>" 337</script>"
336 "The MathJax setup for XHTML files." 338 "The MathJax setup for XHTML files."
337 :group 'org-export-html 339 :group 'org-export-html
340 :version "24.1"
338 :type 'string) 341 :type 'string)
339 342
340(defcustom org-export-html-tag-class-prefix "" 343(defcustom org-export-html-tag-class-prefix ""
@@ -361,6 +364,7 @@ It requires to %s: both will be replaced by the anchor referring
361to the headline (e.g. \"sec-2\"). When set to `nil', don't insert 364to the headline (e.g. \"sec-2\"). When set to `nil', don't insert
362HTML anchors in headlines." 365HTML anchors in headlines."
363 :group 'org-export-html 366 :group 'org-export-html
367 :version "24.1"
364 :type 'string) 368 :type 'string)
365 369
366(defcustom org-export-html-preamble t 370(defcustom org-export-html-preamble t
@@ -392,6 +396,7 @@ precedence over this variable."
392If you need to use a \"%\" character, you need to escape it 396If you need to use a \"%\" character, you need to escape it
393like that: \"%%\"." 397like that: \"%%\"."
394 :group 'org-export-html 398 :group 'org-export-html
399 :version "24.1"
395 :type 'string) 400 :type 'string)
396 401
397(defcustom org-export-html-postamble 'auto 402(defcustom org-export-html-postamble 'auto
@@ -432,6 +437,7 @@ precedence over this variable."
432If you need to use a \"%\" character, you need to escape it 437If you need to use a \"%\" character, you need to escape it
433like that: \"%%\"." 438like that: \"%%\"."
434 :group 'org-export-html 439 :group 'org-export-html
440 :version "24.1"
435 :type 'string) 441 :type 'string)
436 442
437(defcustom org-export-html-home/up-format 443(defcustom org-export-html-home/up-format
@@ -548,6 +554,7 @@ When nil, alignment will only be specified in the column tags, but this
548is ignored by some browsers (like Firefox, Safari). Opera does it right 554is ignored by some browsers (like Firefox, Safari). Opera does it right
549though." 555though."
550 :group 'org-export-tables 556 :group 'org-export-tables
557 :version "24.1"
551 :type 'boolean) 558 :type 'boolean)
552 559
553(defcustom org-export-html-table-use-header-tags-for-first-column nil 560(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."
578 (">" . "&gt;")) 585 (">" . "&gt;"))
579 "Alist of characters to be converted by `org-html-protect'." 586 "Alist of characters to be converted by `org-html-protect'."
580 :group 'org-export-html 587 :group 'org-export-html
588 :version "24.1"
581 :type '(repeat (cons (string :tag "Character") 589 :type '(repeat (cons (string :tag "Character")
582 (string :tag "HTML equivalent")))) 590 (string :tag "HTML equivalent"))))
583 591
@@ -639,6 +647,7 @@ This is a list of three strings, the first one for the preamble
639DIV, the second one for the content DIV and the third one for the 647DIV, the second one for the content DIV and the third one for the
640postamble DIV." 648postamble DIV."
641 :group 'org-export-html 649 :group 'org-export-html
650 :version "24.1"
642 :type '(list 651 :type '(list
643 (string :tag " Div for the preamble:") 652 (string :tag " Div for the preamble:")
644 (string :tag " Div for the content:") 653 (string :tag " Div for the content:")
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index 29f6c74c529..d73a6195b32 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -54,6 +54,7 @@ for timed events. If non-zero, alarms are created.
54- The alarm will go off N minutes before the event 54- The alarm will go off N minutes before the event
55- only a DISPLAY action is defined." 55- only a DISPLAY action is defined."
56 :group 'org-export-icalendar 56 :group 'org-export-icalendar
57 :version "24.1"
57 :type 'integer) 58 :type 'integer)
58 59
59(defcustom org-icalendar-combined-name "OrgMode" 60(defcustom org-icalendar-combined-name "OrgMode"
@@ -64,6 +65,7 @@ for timed events. If non-zero, alarms are created.
64(defcustom org-icalendar-combined-description nil 65(defcustom org-icalendar-combined-description nil
65 "Calendar description for the combined iCalendar (all agenda files)." 66 "Calendar description for the combined iCalendar (all agenda files)."
66 :group 'org-export-icalendar 67 :group 'org-export-icalendar
68 :version "24.1"
67 :type 'string) 69 :type 'string)
68 70
69(defcustom org-icalendar-use-plain-timestamp t 71(defcustom org-icalendar-use-plain-timestamp t
@@ -74,6 +76,7 @@ for timed events. If non-zero, alarms are created.
74(defcustom org-icalendar-honor-noexport-tag nil 76(defcustom org-icalendar-honor-noexport-tag nil
75 "Non-nil means don't export entries with a tag in `org-export-exclude-tags'." 77 "Non-nil means don't export entries with a tag in `org-export-exclude-tags'."
76 :group 'org-export-icalendar 78 :group 'org-export-icalendar
79 :version "24.1"
77 :type 'boolean) 80 :type 'boolean)
78 81
79(defcustom org-icalendar-use-deadline '(event-if-not-todo todo-due) 82(defcustom org-icalendar-use-deadline '(event-if-not-todo todo-due)
@@ -213,6 +216,7 @@ Interesting value are:
213 - \":%Y%m%dT%H%M%SZ\" for time expressed in Universal Time" 216 - \":%Y%m%dT%H%M%SZ\" for time expressed in Universal Time"
214 217
215 :group 'org-export-icalendar 218 :group 'org-export-icalendar
219 :version "24.1"
216 :type '(choice 220 :type '(choice
217 (const :tag "Local time" ":%Y%m%dT%H%M%S") 221 (const :tag "Local time" ":%Y%m%dT%H%M%S")
218 (const :tag "Explicit local time" ";TZID=%Z:%Y%m%dT%H%M%S") 222 (const :tag "Explicit local time" ";TZID=%Z:%Y%m%dT%H%M%S")
diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el
index a14e4043e54..5cd190050b4 100644
--- a/lisp/org/org-inlinetask.el
+++ b/lisp/org/org-inlinetask.el
@@ -173,6 +173,7 @@ or, with the additional package \"todonotes\" for LaTeX,
173This should be the state `org-inlinetask-insert-task' should use by 173This should be the state `org-inlinetask-insert-task' should use by
174default, or nil of no state should be assigned." 174default, or nil of no state should be assigned."
175 :group 'org-inlinetask 175 :group 'org-inlinetask
176 :version "24.1"
176 :type '(choice 177 :type '(choice
177 (const :tag "No state" nil) 178 (const :tag "No state" nil)
178 (string :tag "Specific state"))) 179 (string :tag "Specific state")))
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 2caecff275f..c3775888325 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -215,6 +215,7 @@ Both uppercase and lowercase are handled. Lists with more than
21526 items will fallback to standard numbering. Alphabetical 21526 items will fallback to standard numbering. Alphabetical
216counters like \"[@c]\" will be recognized." 216counters like \"[@c]\" will be recognized."
217 :group 'org-plain-lists 217 :group 'org-plain-lists
218 :version "24.1"
218 :type 'boolean) 219 :type 'boolean)
219 220
220(defcustom org-list-two-spaces-after-bullet-regexp nil 221(defcustom org-list-two-spaces-after-bullet-regexp nil
@@ -258,6 +259,7 @@ indent when non-nil, indenting or outdenting list top-item
258 outdenting a list whose bullet is * to column 0 will 259 outdenting a list whose bullet is * to column 0 will
259 change that bullet to \"-\"." 260 change that bullet to \"-\"."
260 :group 'org-plain-lists 261 :group 'org-plain-lists
262 :version "24.1"
261 :type '(alist :tag "Sets of rules" 263 :type '(alist :tag "Sets of rules"
262 :key-type 264 :key-type
263 (choice 265 (choice
@@ -277,6 +279,7 @@ This affects the behavior of \\[org-move-item-up],
277 \\[org-move-item-down], \\[org-next-item] and 279 \\[org-move-item-down], \\[org-next-item] and
278 \\[org-previous-item]." 280 \\[org-previous-item]."
279 :group 'org-plain-lists 281 :group 'org-plain-lists
282 :version "24.1"
280 :type 'boolean) 283 :type 'boolean)
281 284
282(defvar org-checkbox-statistics-hook nil 285(defvar org-checkbox-statistics-hook nil
@@ -306,6 +309,7 @@ When the indentation would be larger than this, it will become
306By setting this to a small number, usually 1 or 2, one can more 309By setting this to a small number, usually 1 or 2, one can more
307clearly distinguish sub-items in a list." 310clearly distinguish sub-items in a list."
308 :group 'org-plain-lists 311 :group 'org-plain-lists
312 :version "24.1"
309 :type 'integer) 313 :type 'integer)
310 314
311(defcustom org-list-radio-list-templates 315(defcustom org-list-radio-list-templates
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index bcc1c90932a..3bd9a7c0bbd 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -68,6 +68,7 @@ org-agenda-text-search-extra-files
68(defcustom org-mobile-files-exclude-regexp "" 68(defcustom org-mobile-files-exclude-regexp ""
69 "A regexp to exclude files from `org-mobile-files'." 69 "A regexp to exclude files from `org-mobile-files'."
70 :group 'org-mobile 70 :group 'org-mobile
71 :version "24.1"
71 :type 'regexp) 72 :type 'regexp)
72 73
73(defcustom org-mobile-directory "" 74(defcustom org-mobile-directory ""
@@ -84,6 +85,7 @@ Turning on encryption requires to set the same password in the MobileOrg
84application. Before turning this on, check of MobileOrg does already 85application. Before turning this on, check of MobileOrg does already
85support it - at the time of this writing it did not yet." 86support it - at the time of this writing it did not yet."
86 :group 'org-mobile 87 :group 'org-mobile
88 :version "24.1"
87 :type 'boolean) 89 :type 'boolean)
88 90
89(defcustom org-mobile-encryption-tempfile "~/orgtmpcrypt" 91(defcustom org-mobile-encryption-tempfile "~/orgtmpcrypt"
@@ -91,6 +93,7 @@ support it - at the time of this writing it did not yet."
91This must be local file on your local machine (not on the WebDAV server). 93This must be local file on your local machine (not on the WebDAV server).
92You might want to put this file into a directory where only you have access." 94You might want to put this file into a directory where only you have access."
93 :group 'org-mobile 95 :group 'org-mobile
96 :version "24.1"
94 :type 'directory) 97 :type 'directory)
95 98
96(defcustom org-mobile-encryption-password "" 99(defcustom org-mobile-encryption-password ""
@@ -111,6 +114,7 @@ it, this also limits the security of this approach. You can also leave
111this variable empty - Org will then ask for the password once per Emacs 114this variable empty - Org will then ask for the password once per Emacs
112session." 115session."
113 :group 'org-mobile 116 :group 'org-mobile
117 :version "24.1"
114 :type '(string :tag "Password")) 118 :type '(string :tag "Password"))
115 119
116(defvar org-mobile-encryption-password-session nil) 120(defvar org-mobile-encryption-password-session nil)
@@ -150,6 +154,7 @@ custom all custom agendas defined by the user
150all the custom agendas and the default ones 154all the custom agendas and the default ones
151list a list of selection key(s) as string." 155list a list of selection key(s) as string."
152 :group 'org-mobile 156 :group 'org-mobile
157 :version "24.1"
153 :type '(choice 158 :type '(choice
154 (const :tag "Default Agendas" default) 159 (const :tag "Default Agendas" default)
155 (const :tag "Custom Agendas" custom) 160 (const :tag "Custom Agendas" custom)
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 67540a67688..74cab14716c 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -248,6 +248,7 @@ nil won't sort files.
248You can overwrite this default per project in your 248You can overwrite this default per project in your
249`org-publish-project-alist', using `:sitemap-sort-files'." 249`org-publish-project-alist', using `:sitemap-sort-files'."
250 :group 'org-publish 250 :group 'org-publish
251 :version "24.1"
251 :type 'symbol) 252 :type 'symbol)
252 253
253(defcustom org-publish-sitemap-sort-folders 'first 254(defcustom org-publish-sitemap-sort-folders 'first
@@ -260,6 +261,7 @@ Any other value will not mix files and folders.
260You can overwrite this default per project in your 261You can overwrite this default per project in your
261`org-publish-project-alist', using `:sitemap-sort-folders'." 262`org-publish-project-alist', using `:sitemap-sort-folders'."
262 :group 'org-publish 263 :group 'org-publish
264 :version "24.1"
263 :type 'symbol) 265 :type 'symbol)
264 266
265(defcustom org-publish-sitemap-sort-ignore-case nil 267(defcustom org-publish-sitemap-sort-ignore-case nil
@@ -268,12 +270,14 @@ You can overwrite this default per project in your
268You can overwrite this default per project in your 270You can overwrite this default per project in your
269`org-publish-project-alist', using `:sitemap-ignore-case'." 271`org-publish-project-alist', using `:sitemap-ignore-case'."
270 :group 'org-publish 272 :group 'org-publish
273 :version "24.1"
271 :type 'boolean) 274 :type 'boolean)
272 275
273(defcustom org-publish-sitemap-date-format "%Y-%m-%d" 276(defcustom org-publish-sitemap-date-format "%Y-%m-%d"
274 "Format for `format-time-string' which is used to print a date 277 "Format for `format-time-string' which is used to print a date
275in the sitemap." 278in the sitemap."
276 :group 'org-publish 279 :group 'org-publish
280 :version "24.1"
277 :type 'string) 281 :type 'string)
278 282
279(defcustom org-publish-sitemap-file-entry-format "%t" 283(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.
284%a is the author. 288%a is the author.
285%d is the date formatted using `org-publish-sitemap-date-format'." 289%d is the date formatted using `org-publish-sitemap-date-format'."
286 :group 'org-publish 290 :group 'org-publish
291 :version "24.1"
287 :type 'string) 292 :type 'string)
288 293
289 294
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 0a67d79f211..496dafe5e77 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -761,6 +761,7 @@ Org-babel commands."
761 "If non-nil, the effect of TAB in a code block is as if it were 761 "If non-nil, the effect of TAB in a code block is as if it were
762issued in the language major mode buffer." 762issued in the language major mode buffer."
763 :type 'boolean 763 :type 'boolean
764 :version "24.1"
764 :group 'org-babel) 765 :group 'org-babel)
765 766
766(defun org-src-native-tab-command-maybe () 767(defun org-src-native-tab-command-maybe ()
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 62c24c2e35b..ae12cee2abe 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -169,11 +169,13 @@ window configuration, it is not recommended to set this variable to nil,
169except maybe locally in a special file that has mostly tables with long 169except maybe locally in a special file that has mostly tables with long
170fields." 170fields."
171 :group 'org-table 171 :group 'org-table
172 :version "24.1"
172 :type 'boolean) 173 :type 'boolean)
173 174
174(defcustom org-table-fix-formulas-confirm nil 175(defcustom org-table-fix-formulas-confirm nil
175 "Whether the user should confirm when Org fixes formulas." 176 "Whether the user should confirm when Org fixes formulas."
176 :group 'org-table-editing 177 :group 'org-table-editing
178 :version "24.1"
177 :type '(choice 179 :type '(choice
178 (const :tag "with yes-or-no" yes-or-no-p) 180 (const :tag "with yes-or-no" yes-or-no-p)
179 (const :tag "with y-or-n" y-or-n-p) 181 (const :tag "with y-or-n" y-or-n-p)
@@ -236,6 +238,7 @@ number of hours. Other allowed values are 'seconds, 'minutes and
236'days, and the output will be a fraction of seconds, minutes or 238'days, and the output will be a fraction of seconds, minutes or
237days." 239days."
238 :group 'org-table-calculation 240 :group 'org-table-calculation
241 :version "24.1"
239 :type '(choice (symbol :tag "Seconds" 'seconds) 242 :type '(choice (symbol :tag "Seconds" 'seconds)
240 (symbol :tag "Minutes" 'minutes) 243 (symbol :tag "Minutes" 'minutes)
241 (symbol :tag "Hours " 'hours) 244 (symbol :tag "Hours " 'hours)
@@ -247,6 +250,7 @@ For example, using \"~%s~\" will display the result within tilde
247characters. Beware that modifying the display can prevent the 250characters. Beware that modifying the display can prevent the
248field from being used in another formula." 251field from being used in another formula."
249 :group 'org-table-settings 252 :group 'org-table-settings
253 :version "24.1"
250 :type 'string) 254 :type 'string)
251 255
252(defcustom org-table-formula-evaluate-inline t 256(defcustom org-table-formula-evaluate-inline t
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index c1a59ee70cb..4409013589f 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -166,28 +166,33 @@
166(defcustom org-export-taskjuggler-extension ".tjp" 166(defcustom org-export-taskjuggler-extension ".tjp"
167 "Extension of TaskJuggler files." 167 "Extension of TaskJuggler files."
168 :group 'org-export-taskjuggler 168 :group 'org-export-taskjuggler
169 :version "24.1"
169 :type 'string) 170 :type 'string)
170 171
171(defcustom org-export-taskjuggler-project-tag "taskjuggler_project" 172(defcustom org-export-taskjuggler-project-tag "taskjuggler_project"
172 "Tag, property or todo used to find the tree containing all 173 "Tag, property or todo used to find the tree containing all
173the tasks for the project." 174the tasks for the project."
174 :group 'org-export-taskjuggler 175 :group 'org-export-taskjuggler
176 :version "24.1"
175 :type 'string) 177 :type 'string)
176 178
177(defcustom org-export-taskjuggler-resource-tag "taskjuggler_resource" 179(defcustom org-export-taskjuggler-resource-tag "taskjuggler_resource"
178 "Tag, property or todo used to find the tree containing all the 180 "Tag, property or todo used to find the tree containing all the
179resources for the project." 181resources for the project."
180 :group 'org-export-taskjuggler 182 :group 'org-export-taskjuggler
183 :version "24.1"
181 :type 'string) 184 :type 'string)
182 185
183(defcustom org-export-taskjuggler-target-version 2.4 186(defcustom org-export-taskjuggler-target-version 2.4
184 "Which version of TaskJuggler the exporter is targeting." 187 "Which version of TaskJuggler the exporter is targeting."
185 :group 'org-export-taskjuggler 188 :group 'org-export-taskjuggler
189 :version "24.1"
186 :type 'number) 190 :type 'number)
187 191
188(defcustom org-export-taskjuggler-default-project-version "1.0" 192(defcustom org-export-taskjuggler-default-project-version "1.0"
189 "Default version string for the project." 193 "Default version string for the project."
190 :group 'org-export-taskjuggler 194 :group 'org-export-taskjuggler
195 :version "24.1"
191 :type 'string) 196 :type 'string)
192 197
193(defcustom org-export-taskjuggler-default-project-duration 280 198(defcustom org-export-taskjuggler-default-project-duration 280
@@ -195,6 +200,7 @@ resources for the project."
195in the root node of the task tree, i.e. the tree that has been marked 200in the root node of the task tree, i.e. the tree that has been marked
196with `org-export-taskjuggler-project-tag'" 201with `org-export-taskjuggler-project-tag'"
197 :group 'org-export-taskjuggler 202 :group 'org-export-taskjuggler
203 :version "24.1"
198 :type 'integer) 204 :type 'integer)
199 205
200(defcustom org-export-taskjuggler-default-reports 206(defcustom org-export-taskjuggler-default-reports
@@ -214,6 +220,7 @@ with `org-export-taskjuggler-project-tag'"
214}") 220}")
215 "Default reports for the project." 221 "Default reports for the project."
216 :group 'org-export-taskjuggler 222 :group 'org-export-taskjuggler
223 :version "24.1"
217 :type '(repeat (string :tag "Report"))) 224 :type '(repeat (string :tag "Report")))
218 225
219(defcustom org-export-taskjuggler-default-global-properties 226(defcustom org-export-taskjuggler-default-global-properties
@@ -230,6 +237,7 @@ include another TaskJuggler file.
230The global properties are inserted after the project declaration 237The global properties are inserted after the project declaration
231but before any resource and task declarations." 238but before any resource and task declarations."
232 :group 'org-export-taskjuggler 239 :group 'org-export-taskjuggler
240 :version "24.1"
233 :type '(string :tag "Preamble")) 241 :type '(string :tag "Preamble"))
234 242
235;;; Hooks 243;;; Hooks
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 44a53ad0f15..a3bde0fd7f6 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -53,6 +53,7 @@ the value of the relative timer."
53 "The default timer when a timer is set. 53 "The default timer when a timer is set.
54When 0, the user is prompted for a value." 54When 0, the user is prompted for a value."
55 :group 'org-time 55 :group 'org-time
56 :version "24.1"
56 :type 'number) 57 :type 'number)
57 58
58(defvar org-timer-start-hook nil 59(defvar org-timer-start-hook nil
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 6d2370671bd..8a79ec0d765 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -46,11 +46,13 @@
46(defcustom org-wl-link-remove-filter nil 46(defcustom org-wl-link-remove-filter nil
47 "Remove filter condition if message is filter folder." 47 "Remove filter condition if message is filter folder."
48 :group 'org-wl 48 :group 'org-wl
49 :version "24.1"
49 :type 'boolean) 50 :type 'boolean)
50 51
51(defcustom org-wl-shimbun-prefer-web-links nil 52(defcustom org-wl-shimbun-prefer-web-links nil
52 "If non-nil create web links for shimbun messages." 53 "If non-nil create web links for shimbun messages."
53 :group 'org-wl 54 :group 'org-wl
55 :version "24.1"
54 :type 'boolean) 56 :type 'boolean)
55 57
56(defcustom org-wl-nntp-prefer-web-links nil 58(defcustom org-wl-nntp-prefer-web-links nil
@@ -58,16 +60,19 @@
58When folder name contains string \"gmane\" link to gmane, 60When folder name contains string \"gmane\" link to gmane,
59googlegroups otherwise." 61googlegroups otherwise."
60 :type 'boolean 62 :type 'boolean
63 :version "24.1"
61 :group 'org-wl) 64 :group 'org-wl)
62 65
63(defcustom org-wl-disable-folder-check t 66(defcustom org-wl-disable-folder-check t
64 "Disable check for new messages when open a link." 67 "Disable check for new messages when open a link."
65 :type 'boolean 68 :type 'boolean
69 :version "24.1"
66 :group 'org-wl) 70 :group 'org-wl)
67 71
68(defcustom org-wl-namazu-default-index nil 72(defcustom org-wl-namazu-default-index nil
69 "Default namazu search index." 73 "Default namazu search index."
70 :type 'directory 74 :type 'directory
75 :version "24.1"
71 :group 'org-wl) 76 :group 'org-wl)
72 77
73;; Declare external functions and variables 78;; Declare external functions and variables
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 38d4f705742..0f13223d0c1 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -6,7 +6,7 @@
6;; Maintainer: Bastien Guerry <bzg at gnu dot org> 6;; Maintainer: Bastien Guerry <bzg at gnu dot org>
7;; Keywords: outlines, hypermedia, calendar, wp 7;; Keywords: outlines, hypermedia, calendar, wp
8;; Homepage: http://orgmode.org 8;; Homepage: http://orgmode.org
9;; Version: 7.8.07 9;; Version: 7.8.08
10;; 10;;
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
12;; 12;;
@@ -152,6 +152,7 @@ keybinding. By default only Emacs Lisp (which has no
152requirements) is loaded." 152requirements) is loaded."
153 :group 'org-babel 153 :group 'org-babel
154 :set 'org-babel-do-load-languages 154 :set 'org-babel-do-load-languages
155 :version "24.1"
155 :type '(alist :tag "Babel Languages" 156 :type '(alist :tag "Babel Languages"
156 :key-type 157 :key-type
157 (choice 158 (choice
@@ -200,11 +201,12 @@ When non-nil, clones of a subtree don't inherit the ID property.
200Otherwise they inherit the ID property with a new unique 201Otherwise they inherit the ID property with a new unique
201identifier." 202identifier."
202 :type 'boolean 203 :type 'boolean
204 :version "24.1"
203 :group 'org-id) 205 :group 'org-id)
204 206
205;;; Version 207;;; Version
206 208
207(defconst org-version "7.8.07" 209(defconst org-version "7.8.08"
208 "The version number of the file org.el.") 210 "The version number of the file org.el.")
209 211
210;;;###autoload 212;;;###autoload
@@ -259,6 +261,7 @@ With prefix arg HERE, insert it at point."
259(defcustom org-log-buffer-setup-hook nil 261(defcustom org-log-buffer-setup-hook nil
260 "Hook that is run after an Org log buffer is created." 262 "Hook that is run after an Org log buffer is created."
261 :group 'org 263 :group 'org
264 :version "24.1"
262 :type 'hook) 265 :type 'hook)
263 266
264(defvar org-modules) ; defined below 267(defvar org-modules) ; defined below
@@ -428,6 +431,7 @@ already archived entries."
428 (const :tag "All headlines in active region" t) 431 (const :tag "All headlines in active region" t)
429 (const :tag "In active region, headlines at the same level than the first one" 'start-level) 432 (const :tag "In active region, headlines at the same level than the first one" 'start-level)
430 (string :tag "Tags/Property/Todo matcher")) 433 (string :tag "Tags/Property/Todo matcher"))
434 :version "24.1"
431 :group 'org-todo 435 :group 'org-todo
432 :group 'org-archive) 436 :group 'org-archive)
433 437
@@ -496,6 +500,7 @@ Not all export backends support this, but HTML does.
496This option can also be set with the +OPTIONS line, e.g. \"^:nil\"." 500This option can also be set with the +OPTIONS line, e.g. \"^:nil\"."
497 :group 'org-startup 501 :group 'org-startup
498 :group 'org-export-translation 502 :group 'org-export-translation
503 :version "24.1"
499 :type '(choice 504 :type '(choice
500 (const :tag "Always interpret" t) 505 (const :tag "Always interpret" t)
501 (const :tag "Only with braces" {}) 506 (const :tag "Only with braces" {})
@@ -512,6 +517,7 @@ the following lines anywhere in the buffer:
512 517
513 #+STARTUP: beamer" 518 #+STARTUP: beamer"
514 :group 'org-startup 519 :group 'org-startup
520 :version "24.1"
515 :type 'boolean) 521 :type 'boolean)
516 522
517(defcustom org-startup-align-all-tables nil 523(defcustom org-startup-align-all-tables nil
@@ -532,6 +538,7 @@ the following lines anywhere in the buffer:
532 #+STARTUP: inlineimages 538 #+STARTUP: inlineimages
533 #+STARTUP: noinlineimages" 539 #+STARTUP: noinlineimages"
534 :group 'org-startup 540 :group 'org-startup
541 :version "24.1"
535 :type 'boolean) 542 :type 'boolean)
536 543
537(defcustom org-insert-mode-line-in-empty-file nil 544(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.
1069Any other non-nil value will result in a query to the user, if it is 1076Any other non-nil value will result in a query to the user, if it is
1070OK to kill that hidden subtree. When nil, kill without remorse." 1077OK to kill that hidden subtree. When nil, kill without remorse."
1071 :group 'org-edit-structure 1078 :group 'org-edit-structure
1079 :version "24.1"
1072 :type '(choice 1080 :type '(choice
1073 (const :tag "Do not protect hidden subtrees" nil) 1081 (const :tag "Do not protect hidden subtrees" nil)
1074 (const :tag "Protect hidden subtrees with a security query" t) 1082 (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
1089 allows insertion and backward-delete right before ellipses. 1097 allows insertion and backward-delete right before ellipses.
1090 FIXME: maybe in this case we should not even show?" 1098 FIXME: maybe in this case we should not even show?"
1091 :group 'org-edit-structure 1099 :group 'org-edit-structure
1100 :version "24.1"
1092 :type '(choice 1101 :type '(choice
1093 (const :tag "Do not check" nil) 1102 (const :tag "Do not check" nil)
1094 (const :tag "Throw error when trying to edit" error) 1103 (const :tag "Throw error when trying to edit" error)
@@ -1542,6 +1551,7 @@ Changing this requires a restart of Emacs to work correctly."
1542When nil, the link search tries to match a phrase with all words 1551When nil, the link search tries to match a phrase with all words
1543in the search text." 1552in the search text."
1544 :group 'org-link-follow 1553 :group 'org-link-follow
1554 :version "24.1"
1545 :type '(choice 1555 :type '(choice
1546 (const :tag "Use fuzzy text search" nil) 1556 (const :tag "Use fuzzy text search" nil)
1547 (const :tag "Match only exact headline" t) 1557 (const :tag "Match only exact headline" t)
@@ -1661,6 +1671,7 @@ single keystroke rather than having to type \"yes\"."
1661(defcustom org-confirm-shell-link-not-regexp "" 1671(defcustom org-confirm-shell-link-not-regexp ""
1662 "A regexp to skip confirmation for shell links." 1672 "A regexp to skip confirmation for shell links."
1663 :group 'org-link-follow 1673 :group 'org-link-follow
1674 :version "24.1"
1664 :type 'regexp) 1675 :type 'regexp)
1665 1676
1666(defcustom org-confirm-elisp-link-function 'yes-or-no-p 1677(defcustom org-confirm-elisp-link-function 'yes-or-no-p
@@ -1686,6 +1697,7 @@ single keystroke rather than having to type \"yes\"."
1686(defcustom org-confirm-elisp-link-not-regexp "" 1697(defcustom org-confirm-elisp-link-not-regexp ""
1687 "A regexp to skip confirmation for Elisp links." 1698 "A regexp to skip confirmation for Elisp links."
1688 :group 'org-link-follow 1699 :group 'org-link-follow
1700 :version "24.1"
1689 :type 'regexp) 1701 :type 'regexp)
1690 1702
1691(defconst org-file-apps-defaults-gnu 1703(defconst org-file-apps-defaults-gnu
@@ -1908,6 +1920,7 @@ When bulk-refiling from the agenda, the value `note' is forbidden and
1908will temporarily be changed to `time'." 1920will temporarily be changed to `time'."
1909 :group 'org-refile 1921 :group 'org-refile
1910 :group 'org-progress 1922 :group 'org-progress
1923 :version "24.1"
1911 :type '(choice 1924 :type '(choice
1912 (const :tag "No logging" nil) 1925 (const :tag "No logging" nil)
1913 (const :tag "Record timestamp" time) 1926 (const :tag "Record timestamp" time)
@@ -1983,6 +1996,7 @@ If you have added new entries to a buffer that might themselves be targets,
1983you need to clear the cache manually by pressing `C-0 C-c C-w' or, if you 1996you need to clear the cache manually by pressing `C-0 C-c C-w' or, if you
1984find that easier, `C-u C-u C-u C-c C-w'." 1997find that easier, `C-u C-u C-u C-c C-w'."
1985 :group 'org-refile 1998 :group 'org-refile
1999 :version "24.1"
1986 :type 'boolean) 2000 :type 'boolean)
1987 2001
1988(defcustom org-refile-use-outline-path nil 2002(defcustom org-refile-use-outline-path nil
@@ -2038,6 +2052,7 @@ don't contain a set of subtrees, but it might be convenient to
2038do so sometimes: in that case, the first line of the region is 2052do so sometimes: in that case, the first line of the region is
2039converted to a headline before refiling." 2053converted to a headline before refiling."
2040 :group 'org-refile 2054 :group 'org-refile
2055 :version "24.1"
2041 :type 'boolean) 2056 :type 'boolean)
2042 2057
2043(defgroup org-todo nil 2058(defgroup org-todo nil
@@ -2511,6 +2526,7 @@ By default this is the first task in a TODO sequence, or the previous state
2511in a TODO_TYP set. But you can specify another task here. 2526in a TODO_TYP set. But you can specify another task here.
2512alternatively, set the :REPEAT_TO_STATE: property of the entry." 2527alternatively, set the :REPEAT_TO_STATE: property of the entry."
2513 :group 'org-todo 2528 :group 'org-todo
2529 :version "24.1"
2514 :type '(choice (const :tag "Head of sequence" nil) 2530 :type '(choice (const :tag "Head of sequence" nil)
2515 (string :tag "Specific state"))) 2531 (string :tag "Specific state")))
2516 2532
@@ -2595,6 +2611,7 @@ an integer, increasing by 1000 for each priority level.
2595The user can set a different function here, which should take a string 2611The user can set a different function here, which should take a string
2596as an argument and return the numeric priority." 2612as an argument and return the numeric priority."
2597 :group 'org-priorities 2613 :group 'org-priorities
2614 :version "24.1"
2598 :type 'function) 2615 :type 'function)
2599 2616
2600(defgroup org-time nil 2617(defgroup org-time nil
@@ -2736,6 +2753,7 @@ But you can also set a deviating value here.
2736This may t or nil, or the symbol `org-read-date-prefer-future'." 2753This may t or nil, or the symbol `org-read-date-prefer-future'."
2737 :group 'org-agenda 2754 :group 'org-agenda
2738 :group 'org-time 2755 :group 'org-time
2756 :version "24.1"
2739 :type '(choice 2757 :type '(choice
2740 (const :tag "Use org-read-date-prefer-future" 2758 (const :tag "Use org-read-date-prefer-future"
2741 org-read-date-prefer-future) 2759 org-read-date-prefer-future)
@@ -2770,6 +2788,7 @@ has limited date range is not negligible.
2770A workaround for this problem is to use diary sexp dates for time 2788A workaround for this problem is to use diary sexp dates for time
2771stamps outside of this range." 2789stamps outside of this range."
2772 :group 'org-time 2790 :group 'org-time
2791 :version "24.1"
2773 :type 'boolean) 2792 :type 'boolean)
2774 2793
2775(defcustom org-read-date-display-live t 2794(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
2817\"effective time\" of any timestamps between midnight and 8am will be 2836\"effective time\" of any timestamps between midnight and 8am will be
281823:59 of the previous day." 283723:59 of the previous day."
2819 :group 'org-time 2838 :group 'org-time
2839 :version "24.1"
2820 :type 'boolean) 2840 :type 'boolean)
2821 2841
2822(defcustom org-edit-timestamp-down-means-later nil 2842(defcustom org-edit-timestamp-down-means-later nil
@@ -2890,6 +2910,7 @@ tags in that file can be created dynamically (there are none).
2890 'org-complete-tags-always-offer-all-agenda-tags) 2910 'org-complete-tags-always-offer-all-agenda-tags)
2891 t)))" 2911 t)))"
2892 :group 'org-tags 2912 :group 'org-tags
2913 :version "24.1"
2893 :type 'boolean) 2914 :type 'boolean)
2894 2915
2895(defvar org-file-tags nil 2916(defvar org-file-tags nil
@@ -3058,6 +3079,7 @@ and the clock summary:
3058 (org-entry-get (point) \"Effort\")))) 3079 (org-entry-get (point) \"Effort\"))))
3059 (org-minutes-to-hh:mm-string (- effort clocksum))))))" 3080 (org-minutes-to-hh:mm-string (- effort clocksum))))))"
3060 :group 'org-properties 3081 :group 'org-properties
3082 :version "24.1"
3061 :type 'alist) 3083 :type 'alist)
3062 3084
3063(defcustom org-use-property-inheritance nil 3085(defcustom org-use-property-inheritance nil
@@ -3329,6 +3351,7 @@ This is a property list with the following properties:
3329 "Non-nil means signal an error when image creation of LaTeX snippets fails. 3351 "Non-nil means signal an error when image creation of LaTeX snippets fails.
3330When nil, just push out a message." 3352When nil, just push out a message."
3331 :group 'org-latex 3353 :group 'org-latex
3354 :version "24.1"
3332 :type 'boolean) 3355 :type 'boolean)
3333(defcustom org-latex-to-mathml-jar-file nil 3356(defcustom org-latex-to-mathml-jar-file nil
3334 "Value of\"%j\" in `org-latex-to-mathml-convert-command'. 3357 "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.
3337When using MathToWeb as the converter, specify the full-path to 3360When using MathToWeb as the converter, specify the full-path to
3338your mathtoweb.jar file." 3361your mathtoweb.jar file."
3339 :group 'org-latex 3362 :group 'org-latex
3363 :version "24.1"
3340 :type '(choice 3364 :type '(choice
3341 (const :tag "None" nil) 3365 (const :tag "None" nil)
3342 (file :tag "JAR file" :must-match t))) 3366 (file :tag "JAR file" :must-match t)))
@@ -3354,6 +3378,7 @@ This command is used by `org-create-math-formula'.
3354When using MathToWeb as the converter, set this to 3378When using MathToWeb as the converter, set this to
3355\"java -jar %j -unicode -force -df %o %I\"." 3379\"java -jar %j -unicode -force -df %o %I\"."
3356 :group 'org-latex 3380 :group 'org-latex
3381 :version "24.1"
3357 :type '(choice 3382 :type '(choice
3358 (const :tag "None" nil) 3383 (const :tag "None" nil)
3359 (string :tag "\nShell command"))) 3384 (string :tag "\nShell command")))
@@ -3463,6 +3488,7 @@ compiling LaTeX snippets into images for inclusion into HTML."
3463 :group 'org-export-latex 3488 :group 'org-export-latex
3464 :set 'org-set-packages-alist 3489 :set 'org-set-packages-alist
3465 :get 'org-get-packages-alist 3490 :get 'org-get-packages-alist
3491 :version "24.1"
3466 :type '(repeat 3492 :type '(repeat
3467 (choice 3493 (choice
3468 (list :tag "options/package pair" 3494 (list :tag "options/package pair"
@@ -3528,6 +3554,7 @@ lines to the buffer:
3528For example, a value '(title) for this list will make the document's title 3554For example, a value '(title) for this list will make the document's title
3529appear in the buffer without the initial #+TITLE: keyword." 3555appear in the buffer without the initial #+TITLE: keyword."
3530 :group 'org-appearance 3556 :group 'org-appearance
3557 :version "24.1"
3531 :type '(set (const :tag "#+AUTHOR" author) 3558 :type '(set (const :tag "#+AUTHOR" author)
3532 (const :tag "#+DATE" date) 3559 (const :tag "#+DATE" date)
3533 (const :tag "#+EMAIL" email) 3560 (const :tag "#+EMAIL" email)
@@ -3568,11 +3595,13 @@ org-level-* faces."
3568 "Non-nil means show entities as UTF8 characters. 3595 "Non-nil means show entities as UTF8 characters.
3569When nil, the \\name form remains in the buffer." 3596When nil, the \\name form remains in the buffer."
3570 :group 'org-appearance 3597 :group 'org-appearance
3598 :version "24.1"
3571 :type 'boolean) 3599 :type 'boolean)
3572 3600
3573(defcustom org-pretty-entities-include-sub-superscripts t 3601(defcustom org-pretty-entities-include-sub-superscripts t
3574 "Non-nil means, pretty entity display includes formatting sub/superscripts." 3602 "Non-nil means, pretty entity display includes formatting sub/superscripts."
3575 :group 'org-appearance 3603 :group 'org-appearance
3604 :version "24.1"
3576 :type 'boolean) 3605 :type 'boolean)
3577 3606
3578(defvar org-emph-re nil 3607(defvar org-emph-re nil
@@ -5356,6 +5385,7 @@ will be prompted for."
5356(defcustom org-src-fontify-natively nil 5385(defcustom org-src-fontify-natively nil
5357 "When non-nil, fontify code in code blocks." 5386 "When non-nil, fontify code in code blocks."
5358 :type 'boolean 5387 :type 'boolean
5388 :version "24.1"
5359 :group 'org-appearance 5389 :group 'org-appearance
5360 :group 'org-babel) 5390 :group 'org-babel)
5361 5391
@@ -16205,6 +16235,7 @@ minutes.
16205For example, if the value of this variable is ((\"hours\" . 60)), then an 16235For example, if the value of this variable is ((\"hours\" . 60)), then an
16206effort string \"2hours\" is equivalent to 120 minutes." 16236effort string \"2hours\" is equivalent to 120 minutes."
16207 :group 'org-agenda 16237 :group 'org-agenda
16238 :version "24.1"
16208 :type '(alist :key-type (string :tag "Modifier") 16239 :type '(alist :key-type (string :tag "Modifier")
16209 :value-type (number :tag "Minutes"))) 16240 :value-type (number :tag "Minutes")))
16210 16241
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-27 03:50:35 +0000