forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
0d35d9d0d6
|
@ -2764,7 +2764,7 @@ PROPERTIES: The list properties specified in the `:properties' parameter
|
||||||
(properties (plist-get params :properties))
|
(properties (plist-get params :properties))
|
||||||
(inherit-property-p (plist-get params :inherit-props))
|
(inherit-property-p (plist-get params :inherit-props))
|
||||||
(matcher (and tags (cdr (org-make-tags-matcher tags))))
|
(matcher (and tags (cdr (org-make-tags-matcher tags))))
|
||||||
cc st p time level tbl)
|
cc st p tbl)
|
||||||
|
|
||||||
(setq org-clock-file-total-minutes nil)
|
(setq org-clock-file-total-minutes nil)
|
||||||
(when block
|
(when block
|
||||||
|
|
Loading…
Reference in New Issue