diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-26 00:18:28 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-26 00:18:28 +0100 |
commit | dffd30b24e87dd9a5f8e2a1b0a918ab0cbd9f755 (patch) | |
tree | 357eb9237ff21a848202297b4b4cfad7a67ea9f9 | |
parent | f50c44897a0614c87a05af1a7747c550df736e9c (diff) | |
parent | ee7721f795aa5a2ff5c14dd59cbe8ab58ceeefc1 (diff) | |
download | org-mode-dffd30b24e87dd9a5f8e2a1b0a918ab0cbd9f755.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-clock.el | 4 |
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 |