summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2020-03-02 15:55:45 +0100
committerBastien <bzg@gnu.org>2020-03-02 15:55:45 +0100
commita753bad1bfc78cbcd17d71021e2b229932ccfd1e (patch)
tree8eb31bfd06ae2794650545c3258ae1c30e652d48
parentabf5ab0944c2cc65ea44ac746e38c2d3f8ae7bc1 (diff)
downloadorg-mode-a753bad1bfc78cbcd17d71021e2b229932ccfd1e.tar.gz
org-timer.el: Remove useless `or' conditional
* lisp/org-timer.el (org-timer--get-timer-title): Remove useless `or' conditional.
-rw-r--r--lisp/org-timer.el31
1 files changed, 15 insertions, 16 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index b9178f4..251e3c8 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -468,22 +468,21 @@ time is up."
(defun org-timer--get-timer-title ()
"Construct timer title.
Try to use an Org header, otherwise use the buffer name."
- (or
- (cond
- ((derived-mode-p 'org-agenda-mode)
- (let* ((marker (or (get-text-property (point) 'org-marker)))
- (hdmarker (or (get-text-property (point) 'org-hd-marker)
- marker)))
- (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)
- (ignore-errors (org-get-heading))))
- (buffer-name (buffer-base-buffer))))
+ (cond
+ ((derived-mode-p 'org-agenda-mode)
+ (let* ((marker (or (get-text-property (point) 'org-marker)))
+ (hdmarker (or (get-text-property (point) 'org-hd-marker)
+ marker)))
+ (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)
+ (ignore-errors (org-get-heading)))
+ (t (buffer-name (buffer-base-buffer)))))
(provide 'org-timer)