Document new erc module "notifications"

* doc/misc/erc.texi (Modules): Undocument obsolete "hecomplete".
Add "notifications".

* lisp/erc/erc.el (erc-modules): Add "notifications".  Tweak "hecomplete" doc.

* etc/NEWS: Related edit.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b3b4ad071470f2c55f54c260f693f3b588c4ed13..82e0cd0f85698fc8e34592954fa3b5d0b5454d24 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-13  Glenn Morris  <rgm@gnu.org>
+
+       * erc.texi (Modules): Undocument obsolete "hecomplete".
+       Add "notifications".
+
 2012-11-12  Glenn Morris  <rgm@gnu.org>
 
        * flymake.texi (Customizable variables)

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 378180bef31f87203054d859ee79d94251250e33..b5c0dd3c718ea865f68b564969cb2edcb557e7d9 100644 (file)
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -390,11 +390,6 @@ Complete nicknames and commands (programmable)
 @item fill
 Wrap long lines
 
-@cindex modules, hecomplete
-@item hecomplete
-Complete nicknames and commands (old).  This is the old module---you
-might prefer the ``completion'' module instead.
-
 @cindex modules, identd
 @item identd
 Launch an identd server on port 8113
@@ -427,6 +422,11 @@ Don't display non-IRC commands after evaluation
 @item notify
 Notify when the online status of certain users changes
 
+@cindex modules, notifications
+@item notifications
+Send you a notification when you get a private message,
+or your nickname is mentioned
+
 @cindex modules, page
 @item page
 Process CTCP PAGE requests from IRC

diff --git a/etc/NEWS b/etc/NEWS
index 23210e5212fd5f4a558f7cee2f27788bca3397b2..80c1e5ff4ad48196070042f7b863b7e5a5ff131f 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -434,8 +434,9 @@ The global binding for `M-=', `count-words-region' is in effect.
 
 ** ERC
 
-*** New package `erc-desktop-notifications.el', which can send a notification
-when you receive a private message or your nickname is mentioned.
++++
+*** New module "notifications", which can send a notification when you
+receive a private message or your nickname is mentioned.
 
 *** ERC will look up server/channel names via auth-source and use any
 channel keys found.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 13dbba769a4b08b0233a88ff9d514e856622c4b1..390b34cba400c354d0788eafc92b5e5fb77c6872 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-13  Glenn Morris  <rgm@gnu.org>
+
+       * erc.el (erc-modules): Add "notifications".  Tweak "hecomplete" doc.
+
 2012-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc-backend.el: Only require `erc' during compilation (bug#12740).

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 2e97131b603c94a07bb694974f9b76527f78424b..7cb6fbb595b6ccfa1118b095d4c983f62e34f4da 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1843,7 +1843,7 @@ removed from the list will be disabled."
           capab-identify)
     (const :tag "completion: Complete nicknames and commands (programmable)"
           completion)
-    (const :tag "hecomplete: Complete nicknames and commands (old)" hecomplete)
+    (const :tag "hecomplete: Complete nicknames and commands (obsolete, use \"completion\")" hecomplete)
     (const :tag "dcc: Provide Direct Client-to-Client support" dcc)
     (const :tag "fill: Wrap long lines" fill)
     (const :tag "identd: Launch an identd server on port 8113" identd)
@@ -1863,6 +1863,8 @@ removed from the list will be disabled."
     (const :tag
           "notify: Notify when the online status of certain users changes"
           notify)
+    (const :tag "notifications: Send notifications on PRIVMSG or nickname mentions"
+          notifications)
     (const :tag "page: Process CTCP PAGE requests from IRC" page)
     (const :tag "readonly: Make displayed lines read-only" readonly)
     (const :tag "replace: Replace text in messages" replace)