summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2012-10-04 15:11:49 +0200
committerJulien Danjou <julien@danjou.info>2012-10-04 15:11:49 +0200
commit6938736c79bf1d14fcd10a4235da861b661eebb5 (patch)
tree5a7ab493d80801f2cfe62c09f57067cdc16c7a1f
parent6bab5d8b319af32f3486dc57bfdb8c219e7f9d33 (diff)
downloademacs-6938736c79bf1d14fcd10a4235da861b661eebb5.tar.gz
Rename erc-notifications.el to erc-desktop-notifications.el
* erc-desktop-notifications.el: Rename from erc-notifications to avoid clash with 8+3 filename format and erc-notify.el.
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-desktop-notifications.el (renamed from lisp/erc/erc-notifications.el)8
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 348765036ea..3558a8a90b5 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-04 Julien Danjou <julien@danjou.info>
+
+ * erc-desktop-notifications.el: Rename from erc-notifications to
+ avoid clash with 8+3 filename format and erc-notify.el.
+
2012-09-25 Chong Yidong <cyd@gnu.org>
* erc.el (erc-send-command): Use define-obsolete-function-alias.
diff --git a/lisp/erc/erc-notifications.el b/lisp/erc/erc-desktop-notifications.el
index 4faffc913c5..57b93f43219 100644
--- a/lisp/erc/erc-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -1,4 +1,4 @@
-;; erc-notifications.el -- Send notification on PRIVMSG or mentions
+;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions
;; Copyright (C) 2012 Free Software Foundation, Inc.
@@ -75,7 +75,7 @@ This will replace the last notification sent with this function."
(member nick erc-track-exclude)))
(erc-notifications-notify nick msg)))))
-;;;###autoload(autoload 'erc-notifications-mode "erc-notifications" "" t)
+;;;###autoload(autoload 'erc-notifications-mode "erc-desktop-notifications" "" t)
(define-erc-module notifications nil
"Send notifications on private message reception and mentions."
;; Enable
@@ -85,6 +85,6 @@ This will replace the last notification sent with this function."
((remove-hook 'erc-server-PRIVMSG-functions 'erc-notifications-PRIVMSG)
(remove-hook 'erc-text-matched-hook 'erc-notifications-notify-on-match)))
-(provide 'erc-notifications)
+(provide 'erc-desktop-notifications)
-;;; erc-notifications.el ends here
+;;; erc-desktop-notifications.el ends here