tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

org-timer.el: Remove useless `or' conditional 

* lisp/org-timer.el (org-timer--get-timer-title): Remove
useless `or' conditional.
This commit is contained in:
Bastien 2020-03-02 15:55:45 +01:00
parent abf5ab0944
commit a753bad1bf
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lisp/org-timer.el
View File

@ -468,22 +468,21 @@ time is up."
(defun org-timer--get-timer-title () (defun org-timer--get-timer-title ()
"Construct timer title. "Construct timer title.
Try to use an Org header, otherwise use the buffer name." Try to use an Org header, otherwise use the buffer name."
(or (cond
(cond ((derived-mode-p 'org-agenda-mode)
((derived-mode-p 'org-agenda-mode) (let* ((marker (or (get-text-property (point) 'org-marker)))
(let* ((marker (or (get-text-property (point) 'org-marker))) (hdmarker (or (get-text-property (point) 'org-hd-marker)
(hdmarker (or (get-text-property (point) 'org-hd-marker) marker)))
marker))) (when (and marker (marker-buffer marker))
(when (and marker (marker-buffer marker)) (with-current-buffer (marker-buffer marker)
(with-current-buffer (marker-buffer marker) (org-with-wide-buffer
(org-with-wide-buffer (goto-char hdmarker)
(goto-char hdmarker) (org-show-entry)
(org-show-entry) (or (ignore-errors (org-get-heading))
(or (ignore-errors (org-get-heading)) (buffer-name (buffer-base-buffer))))))))
(buffer-name (buffer-base-buffer)))))))) ((derived-mode-p 'org-mode)
((derived-mode-p 'org-mode) (ignore-errors (org-get-heading)))
(ignore-errors (org-get-heading)))) (t (buffer-name (buffer-base-buffer)))))
(buffer-name (buffer-base-buffer))))
(provide 'org-timer) (provide 'org-timer)