diff options
| author | Alex Murray <murray.alex@gmail.com> | 2019-04-04 16:49:48 +1030 |
|---|---|---|
| committer | Basil L. Contovounesios <contovob@tcd.ie> | 2019-04-12 13:08:28 +0100 |
| commit | 6dc4c722af4e5f9f189631638700cd1fb3cc2edb (patch) | |
| tree | 1fc30f8cbacf699fc300f334948726bf502a1274 | |
| parent | 2b82c829706808668ea2e8a63b6bc4351d93afc2 (diff) | |
| download | emacs-6dc4c722af4e5f9f189631638700cd1fb3cc2edb.tar.gz | |
Pop to originating erc buffer when clicking desktop notification
* lisp/erc/erc-desktop-notifications.el: Switch to lexical-binding.
(erc-notifications-notify): Add a default action to the desktop
notification which pops to the buffer from which the notification
originated. (Bug#35141)
Copyright-paperwork-exempt: yes
| -rw-r--r-- | lisp/erc/erc-desktop-notifications.el | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el index 56b93925ced..41b7420320c 100644 --- a/lisp/erc/erc-desktop-notifications.el +++ b/lisp/erc/erc-desktop-notifications.el @@ -1,4 +1,4 @@ -;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions +;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions -*- lexical-binding:t -*- ;; Copyright (C) 2012-2019 Free Software Foundation, Inc. @@ -59,13 +59,19 @@ This will replace the last notification sent with this function." (dbus-ignore-errors (setq erc-notifications-last-notification - (notifications-notify :bus erc-notifications-bus - :title (xml-escape-string nick) - :body (xml-escape-string msg) - :replaces-id erc-notifications-last-notification - :app-icon erc-notifications-icon)))) - -(defun erc-notifications-PRIVMSG (proc parsed) + (let ((channel (current-buffer))) + (notifications-notify :bus erc-notifications-bus + :title (format "%s in %s" + (xml-escape-string nick) + channel) + :body (xml-escape-string msg) + :replaces-id erc-notifications-last-notification + :app-icon erc-notifications-icon + :actions '("default" "Switch to buffer") + :on-action (lambda (&rest _) + (pop-to-buffer channel))))))) + +(defun erc-notifications-PRIVMSG (_proc parsed) (let ((nick (car (erc-parse-user (erc-response.sender parsed)))) (target (car (erc-response.command-args parsed))) (msg (erc-response.contents parsed))) |