diff options
| author | Bastien Guerry <bzg@gnu.org> | 2020-12-13 13:44:15 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2020-12-13 13:44:15 +0100 |
| commit | f22856a5c54d99867cd24c08a14bbda23d5c6229 (patch) | |
| tree | b6bd688963531eccb8b9d18195df0edfc34ba59d /lisp/org/org-timer.el | |
| parent | 6aa9fe3e1b4052b2acde86404a90e35893ebfa00 (diff) | |
| download | emacs-f22856a5c54d99867cd24c08a14bbda23d5c6229.tar.gz emacs-f22856a5c54d99867cd24c08a14bbda23d5c6229.tar.bz2 emacs-f22856a5c54d99867cd24c08a14bbda23d5c6229.zip | |
Update to Org 9.4.1
Diffstat (limited to 'lisp/org/org-timer.el')
| -rw-r--r-- | lisp/org/org-timer.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el index a1eb5e4a7a7..251e3c86b68 100644 --- a/lisp/org/org-timer.el +++ b/lisp/org/org-timer.el @@ -470,19 +470,18 @@ time is up." 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) - (org-agenda-error))) + (let* ((marker (or (get-text-property (point) 'org-marker))) (hdmarker (or (get-text-property (point) 'org-hd-marker) marker))) - (with-current-buffer (marker-buffer marker) - (org-with-wide-buffer - (goto-char hdmarker) - (org-show-entry) - (or (ignore-errors (org-get-heading)) - (buffer-name (buffer-base-buffer))))))) + (when (and marker (marker-buffer marker)) + (with-current-buffer (marker-buffer marker) + (org-with-wide-buffer + (goto-char hdmarker) + (org-show-entry) + (or (ignore-errors (org-get-heading)) + (buffer-name (buffer-base-buffer)))))))) ((derived-mode-p 'org-mode) - (or (ignore-errors (org-get-heading)) - (buffer-name (buffer-base-buffer)))) + (ignore-errors (org-get-heading))) (t (buffer-name (buffer-base-buffer))))) (provide 'org-timer) |