summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2020-01-26 17:03:21 +0100
committerBastien <bzg@gnu.org>2020-01-26 17:03:21 +0100
commitb6fc8396a69797d4fceb9668754db1c38c2e5544 (patch)
treea19ceb68a24d6aac4e2990a1df17057961c9ebff
parent389875c495d49bd715b7cf0aec0c293b90e65c92 (diff)
parenta3c373a1bf65c29f2d74a4b401844f099de4253f (diff)
downloadorg-mode-b6fc8396a69797d4fceb9668754db1c38c2e5544.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-clock.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 7fb97f0..a62246b 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -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))))