0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 18:36:26 +00:00

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-03-04 17:04:38 +01:00
commit 9d7b1ef8a9

View file

@ -334,11 +334,12 @@ For more information, see `org-clocktable-write-default'."
:version "24.1" :version "24.1"
:type 'alist) :type 'alist)
(defcustom org-clock-clocktable-default-properties '(:maxlevel 2 :scope file) (defcustom org-clock-clocktable-default-properties '(:maxlevel 2)
"Default properties for new clocktables. "Default properties for new clocktables.
These will be inserted into the BEGIN line, to make it easy for users to These will be inserted into the BEGIN line, to make it easy for users to
play with them." play with them."
:group 'org-clocktable :group 'org-clocktable
:package-version '(Org . "9.2")
:type 'plist) :type 'plist)
(defcustom org-clock-idle-time nil (defcustom org-clock-idle-time nil