summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-11-17 18:08:44 -0500
committerKyle Meyer <kyle@kyleam.com>2019-11-17 18:08:44 -0500
commit02551b8d4fc9b7f838fa327aa84dcc93f32eeb8b (patch)
tree93541a6bc01897091054e9ee89d27076969126e9
parenta4fa04bbd41cc25c3aa7302c1bfa6f645ff4fe26 (diff)
parent044e9718c18be7c1faab6dcf0c8b1cea1761530e (diff)
downloadorg-mode-02551b8d4fc9b7f838fa327aa84dcc93f32eeb8b.tar.gz
Merge branch 'master' into next
-rw-r--r--lisp/org-timer.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 9674219..68fe966 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -466,7 +466,8 @@ time is up."
(run-hooks 'org-timer-done-hook)))))
(defun org-timer--get-timer-title ()
- "Construct timer title from heading or file name of Org buffer."
+ "Construct timer title.
+Try to use an Org header, otherwise use the buffer name."
(cond
((derived-mode-p 'org-agenda-mode)
(let* ((marker (or (get-text-property (point) 'org-marker)
@@ -482,7 +483,7 @@ time is up."
((derived-mode-p 'org-mode)
(or (ignore-errors (org-get-heading))
(buffer-name (buffer-base-buffer))))
- (t (error "Not in an Org buffer"))))
+ (t (buffer-name (buffer-base-buffer)))))
(provide 'org-timer)