procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-09-13 09:42:01 +02:00
commit 4db1f22b64
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/erc/ChangeLog
View file

@ -1,3 +1,7 @@
2013-09-13 Glenn Morris <rgm@gnu.org>
* erc-desktop-notifications.el (dbus-debug): Declare.
2013-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
* erc.el: Use lexical-binding.

2
lisp/erc/erc-desktop-notifications.el
View file

@ -46,6 +46,8 @@
:group 'erc-notifications
:type '(choice (const :tag "No icon" nil) file))
(defvar dbus-debug) ; used in the macroexpansion of dbus-ignore-errors
(defun erc-notifications-notify (nick msg)
"Notify that NICK send some MSG.
This will replace the last notification sent with this function."