mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:07:54 +00:00
Merge branch 'maint'
This commit is contained in:
commit
b6fc8396a6
|
@ -808,6 +808,7 @@ If PLAY-SOUND is non-nil, it overrides `org-clock-sound'."
|
||||||
"Show notification.
|
"Show notification.
|
||||||
Use `org-show-notification-handler' if defined,
|
Use `org-show-notification-handler' if defined,
|
||||||
use libnotify if available, or fall back on a message."
|
use libnotify if available, or fall back on a message."
|
||||||
|
(ignore-errors (require 'notifications))
|
||||||
(cond ((functionp org-show-notification-handler)
|
(cond ((functionp org-show-notification-handler)
|
||||||
(funcall org-show-notification-handler notification))
|
(funcall org-show-notification-handler notification))
|
||||||
((stringp org-show-notification-handler)
|
((stringp org-show-notification-handler)
|
||||||
|
@ -823,11 +824,6 @@ use libnotify if available, or fall back on a message."
|
||||||
((executable-find "notify-send")
|
((executable-find "notify-send")
|
||||||
(start-process "emacs-timer-notification" nil
|
(start-process "emacs-timer-notification" nil
|
||||||
"notify-send" notification))
|
"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
|
;; Maybe the handler will send a message, so only use message as
|
||||||
;; a fall back option
|
;; a fall back option
|
||||||
(t (message "%s" notification))))
|
(t (message "%s" notification))))
|
||||||
|
|
Loading…
Reference in a new issue