diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-03-10 21:48:55 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-03-10 21:48:55 +0100 |
| commit | c020e92adaa8f16346a8d2c17131440bad44895c (patch) | |
| tree | 88c0e80e1f3807d4fe6be0aad120d601e317fda0 | |
| parent | 3ae98eafd0ee8dd9a472e8f36890e19425db45a4 (diff) | |
| parent | cd13b0241d459fae3917ee3327e8e045bef4f4d8 (diff) | |
| download | org-mode-c020e92adaa8f16346a8d2c17131440bad44895c.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-clock.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 317256a..b8b4f1b 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2385,9 +2385,15 @@ the currently selected interval size." (`file-with-archives (and buffer-file-name (org-add-archive-files (list buffer-file-name)))) + ((or `nil `file `subtree `tree + (and (pred symbolp) + (guard (string-match "\\`tree\\([0-9]+\\)\\'" + (symbol-name scope))))) + (or (buffer-file-name (buffer-base-buffer)) + (current-buffer))) ((pred functionp) (funcall scope)) ((pred consp) scope) - (_ (or (buffer-file-name) (current-buffer))))) + (_ (user-error "Unknown scope: %S" scope)))) (block (plist-get params :block)) (ts (plist-get params :tstart)) (te (plist-get params :tend)) |