aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Danjou2012-10-04 15:11:49 +0200
committerJulien Danjou2012-10-04 15:11:49 +0200
commit6938736c79bf1d14fcd10a4235da861b661eebb5 (patch)
tree5a7ab493d80801f2cfe62c09f57067cdc16c7a1f
parent6bab5d8b319af32f3486dc57bfdb8c219e7f9d33 (diff)
downloademacs-6938736c79bf1d14fcd10a4235da861b661eebb5.tar.gz
emacs-6938736c79bf1d14fcd10a4235da861b661eebb5.zip
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 @@
12012-10-04 Julien Danjou <julien@danjou.info>
2
3 * erc-desktop-notifications.el: Rename from erc-notifications to
4 avoid clash with 8+3 filename format and erc-notify.el.
5
12012-09-25 Chong Yidong <cyd@gnu.org> 62012-09-25 Chong Yidong <cyd@gnu.org>
2 7
3 * erc.el (erc-send-command): Use define-obsolete-function-alias. 8 * 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 @@
1;; erc-notifications.el -- Send notification on PRIVMSG or mentions 1;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions
2 2
3;; Copyright (C) 2012 Free Software Foundation, Inc. 3;; Copyright (C) 2012 Free Software Foundation, Inc.
4 4
@@ -75,7 +75,7 @@ This will replace the last notification sent with this function."
75 (member nick erc-track-exclude))) 75 (member nick erc-track-exclude)))
76 (erc-notifications-notify nick msg))))) 76 (erc-notifications-notify nick msg)))))
77 77
78;;;###autoload(autoload 'erc-notifications-mode "erc-notifications" "" t) 78;;;###autoload(autoload 'erc-notifications-mode "erc-desktop-notifications" "" t)
79(define-erc-module notifications nil 79(define-erc-module notifications nil
80 "Send notifications on private message reception and mentions." 80 "Send notifications on private message reception and mentions."
81 ;; Enable 81 ;; Enable
@@ -85,6 +85,6 @@ This will replace the last notification sent with this function."
85 ((remove-hook 'erc-server-PRIVMSG-functions 'erc-notifications-PRIVMSG) 85 ((remove-hook 'erc-server-PRIVMSG-functions 'erc-notifications-PRIVMSG)
86 (remove-hook 'erc-text-matched-hook 'erc-notifications-notify-on-match))) 86 (remove-hook 'erc-text-matched-hook 'erc-notifications-notify-on-match)))
87 87
88(provide 'erc-notifications) 88(provide 'erc-desktop-notifications)
89 89
90;;; erc-notifications.el ends here 90;;; erc-desktop-notifications.el ends here