[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110858: Document new erc module "notifications"

[Glenn Morris]

------------------------------------------------------------
revno: 110858
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-12 19:40:44 -0800
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/erc.texi
  etc/NEWS
  lisp/erc/ChangeLog
  lisp/erc/erc.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-11-12 08:42:27 +0000
+++ b/doc/misc/ChangeLog        2012-11-13 03:40:44 +0000
@@ -1,3 +1,8 @@
+2012-11-13  Glenn Morris  <address@hidden>
+
+       * erc.texi (Modules): Undocument obsolete "hecomplete".
+       Add "notifications".
+
 2012-11-12  Glenn Morris  <address@hidden>
 
        * flymake.texi (Customizable variables)

=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2012-10-06 01:42:02 +0000
+++ b/doc/misc/erc.texi 2012-11-13 03:40:44 +0000
@@ -390,11 +390,6 @@
 @item fill
 Wrap long lines
 
address@hidden modules, hecomplete
address@hidden 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 @@
 @item notify
 Notify when the online status of certain users changes
 
address@hidden modules, notifications
address@hidden 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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-11-13 03:16:17 +0000
+++ b/etc/NEWS  2012-11-13 03:40:44 +0000
@@ -434,8 +434,9 @@
 
 ** 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.

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-10-28 15:34:52 +0000
+++ b/lisp/erc/ChangeLog        2012-11-13 03:40:44 +0000
@@ -1,3 +1,7 @@
+2012-11-13  Glenn Morris  <address@hidden>
+
+       * erc.el (erc-modules): Add "notifications".  Tweak "hecomplete" doc.
+
 2012-10-28  Stefan Monnier  <address@hidden>
 
        * erc-backend.el: Only require `erc' during compilation (bug#12740).

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2012-10-15 16:49:57 +0000
+++ b/lisp/erc/erc.el   2012-11-13 03:40:44 +0000
@@ -1843,7 +1843,7 @@
           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 @@
     (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)