aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-11-13 00:14:15 -0800
committerGlenn Morris2012-11-13 00:14:15 -0800
commit274f5de608fd1a4dd99c2f9e4e9214579554f437 (patch)
treec28e53ceb78d8ee4dba0adae9da9d35d34620588
parentf925b109e76f36081d9495252fcee204deb4c1fb (diff)
downloademacs-274f5de608fd1a4dd99c2f9e4e9214579554f437.tar.gz
emacs-274f5de608fd1a4dd99c2f9e4e9214579554f437.zip
Document erc-lurker-hide-list
* doc/misc/erc.texi (Options): Make a start by adding erc-hide-list, erc-lurker-hide-list. * etc/NEWS: Related edit.
-rw-r--r--doc/misc/ChangeLog1
-rw-r--r--doc/misc/erc.texi18
-rw-r--r--etc/NEWS4
3 files changed, 20 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0a837320b43..1ec8a3d56ff 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -3,6 +3,7 @@
3 * erc.texi (Modules): Undocument obsolete "hecomplete". 3 * erc.texi (Modules): Undocument obsolete "hecomplete".
4 Add "notifications". 4 Add "notifications".
5 (Connecting): Add brief section on passwords. 5 (Connecting): Add brief section on passwords.
6 (Options): Make a start by adding erc-hide-list, erc-lurker-hide-list.
6 7
72012-11-12 Glenn Morris <rgm@gnu.org> 82012-11-12 Glenn Morris <rgm@gnu.org>
8 9
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index ea315cd86fa..4be94df4b45 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -737,10 +737,24 @@ stuff, to the current ERC buffer."
737@c PRE5_4: (Node) Document every ERC option (module options go in 737@c PRE5_4: (Node) Document every ERC option (module options go in
738@c previous chapter) 738@c previous chapter)
739 739
740This section has not yet been written. For now, the easiest way to 740This section is extremely incomplete. For now, the easiest way to
741check out the available options for ERC is to do 741check out all the available options for ERC is to do
742@kbd{M-x customize-group erc RET}. 742@kbd{M-x customize-group erc RET}.
743 743
744@defopt erc-hide-list
745If non, @code{nil}, this is a list of IRC message types to hide, e.g.
746
747@example
748(setq erc-hide-list '("JOIN" "PART" "QUIT"))
749@end example
750@end defopt
751
752@defopt erc-lurker-hide-list
753Like @code{erc-hide-list}, but only applies to messages sent by
754lurkers. The function @code{erc-lurker-p} determines whether a given
755nickname is considerd a lurker.
756@end defopt
757
744 758
745@node Getting Help and Reporting Bugs 759@node Getting Help and Reporting Bugs
746@chapter Getting Help and Reporting Bugs 760@chapter Getting Help and Reporting Bugs
diff --git a/etc/NEWS b/etc/NEWS
index ca20c4dcff1..9fcb2d13565 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -442,7 +442,9 @@ receive a private message or your nickname is mentioned.
442*** ERC will look up server/channel names via auth-source and use any 442*** ERC will look up server/channel names via auth-source and use any
443channel keys found. 443channel keys found.
444 444
445*** FIXME erc-lurker-hide-list 445+++
446*** New option `erc-lurker-hide-list', similar to `erc-hide-list', but
447only applies to messages sent by lurkers.
446 448
447+++ 449+++
448** Flymake uses fringe bitmaps to indicate errors and warnings. 450** Flymake uses fringe bitmaps to indicate errors and warnings.