ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-03-29 16:34:21 +02:00
parent d4cae34eaa df0c7d96a2
commit 0b87157e19
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-clock.el
View File

@ -2416,6 +2416,7 @@ the currently selected interval size."
(org-clock-get-table-data file params))))) (org-clock-get-table-data file params)))))
files) files)
;; Get the right restriction for the scope. ;; Get the right restriction for the scope.
(save-restriction
(cond (cond
((not scope)) ;use the restriction as it is now ((not scope)) ;use the restriction as it is now
((eq scope 'file) (widen)) ((eq scope 'file) (widen))
@ -2435,7 +2436,7 @@ the currently selected interval size."
level) level)
(throw 'exit nil)))) (throw 'exit nil))))
(org-narrow-to-subtree)))) (org-narrow-to-subtree))))
(list (org-clock-get-table-data nil params)))) (list (org-clock-get-table-data nil params)))))
(multifile (multifile
;; Even though `file-with-archives' can consist of ;; Even though `file-with-archives' can consist of
;; multiple files, we consider this is one extended file ;; multiple files, we consider this is one extended file