diff options
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-desktop-notifications.el | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index e0628dbb80a..70cab5af319 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * erc-desktop-notifications.el (dbus-debug): Declare. | ||
| 4 | |||
| 1 | 2013-08-22 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-08-22 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * erc.el: Use lexical-binding. | 7 | * erc.el: Use lexical-binding. |
diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el index ac6c202b18a..60c49cc8870 100644 --- a/lisp/erc/erc-desktop-notifications.el +++ b/lisp/erc/erc-desktop-notifications.el | |||
| @@ -46,6 +46,8 @@ | |||
| 46 | :group 'erc-notifications | 46 | :group 'erc-notifications |
| 47 | :type '(choice (const :tag "No icon" nil) file)) | 47 | :type '(choice (const :tag "No icon" nil) file)) |
| 48 | 48 | ||
| 49 | (defvar dbus-debug) ; used in the macroexpansion of dbus-ignore-errors | ||
| 50 | |||
| 49 | (defun erc-notifications-notify (nick msg) | 51 | (defun erc-notifications-notify (nick msg) |
| 50 | "Notify that NICK send some MSG. | 52 | "Notify that NICK send some MSG. |
| 51 | This will replace the last notification sent with this function." | 53 | This will replace the last notification sent with this function." |