summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-11-26 00:15:44 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-11-26 00:15:44 +0100
commitee7721f795aa5a2ff5c14dd59cbe8ab58ceeefc1 (patch)
tree9b8493583318ab3f448a986453b381cb099d6f01
parentb77ef877ab6b9f86a0691917641770fb9b700ff3 (diff)
downloadorg-mode-ee7721f795aa5a2ff5c14dd59cbe8ab58ceeefc1.tar.gz
org-clock: Fix clock tables with file list scope
* lisp/org-clock.el (org-dblock-write:clocktable): Handle scope as a list of files. Reported-by: Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/110452>
-rw-r--r--lisp/org-clock.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index d2dd68f..65c13fd 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2370,6 +2370,7 @@ the currently selected interval size."
(`file-with-archives
(and buffer-file-name
(org-add-archive-files (list buffer-file-name))))
+ ((pred consp) scope)
(_ (or (buffer-file-name) (current-buffer)))))
(block (plist-get params :block))
(ts (plist-get params :tstart))
@@ -2430,8 +2431,7 @@ the currently selected interval size."
;; Even though `file-with-archives' can consist of
;; multiple files, we consider this is one extended file
;; instead.
- (cond ((eq scope 'file-with-archives) nil)
- ((consp files)))))
+ (and (consp files) (not (eq scope 'file-with-archives)))))
(funcall formatter
origin