mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-01-26 17:03:21 +01:00
parent 389875c495 a3c373a1bf
commit b6fc8396a6
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-clock.el
View File

@ -808,6 +808,7 @@ If PLAY-SOUND is non-nil, it overrides `org-clock-sound'."
"Show notification.
Use `org-show-notification-handler' if defined,
use libnotify if available, or fall back on a message."
(ignore-errors (require 'notifications))
(cond ((functionp org-show-notification-handler)
(funcall org-show-notification-handler notification))
((stringp org-show-notification-handler)
@ -823,11 +824,6 @@ use libnotify if available, or fall back on a message."
((executable-find "notify-send")
(start-process "emacs-timer-notification" nil
"notify-send" notification))
((string-equal system-type "windows-nt")
(w32-notification-close (w32-notification-notify
:title "Org mode message"
:body notification
:urgency 'low)))
;; Maybe the handler will send a message, so only use message as
;; a fall back option
(t (message "%s" notification))))