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

41
lisp/org-clock.el
View File

@ -2416,26 +2416,27 @@ 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.
(cond (save-restriction
((not scope)) ;use the restriction as it is now (cond
((eq scope 'file) (widen)) ((not scope)) ;use the restriction as it is now
((eq scope 'subtree) (org-narrow-to-subtree)) ((eq scope 'file) (widen))
((eq scope 'tree) ((eq scope 'subtree) (org-narrow-to-subtree))
(while (org-up-heading-safe)) ((eq scope 'tree)
(org-narrow-to-subtree)) (while (org-up-heading-safe))
((and (symbolp scope) (org-narrow-to-subtree))
(string-match "\\`tree\\([0-9]+\\)\\'" ((and (symbolp scope)
(symbol-name scope))) (string-match "\\`tree\\([0-9]+\\)\\'"
(let ((level (string-to-number (symbol-name scope)))
(match-string 1 (symbol-name scope))))) (let ((level (string-to-number
(catch 'exit (match-string 1 (symbol-name scope)))))
(while (org-up-heading-safe) (catch 'exit
(looking-at org-outline-regexp) (while (org-up-heading-safe)
(when (<= (org-reduced-level (funcall outline-level)) (looking-at org-outline-regexp)
level) (when (<= (org-reduced-level (funcall outline-level))
(throw 'exit nil)))) level)
(org-narrow-to-subtree)))) (throw 'exit nil))))
(list (org-clock-get-table-data nil params)))) (org-narrow-to-subtree))))
(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