procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update ERC docs and update MAINTANERS to include myself

Browse source
This commit is contained in:
kwhite 2015-02-04 11:23:10 -05:00
parent d825f66db8
commit c6487170e3
4 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/ChangeLog
View file

@ -1,3 +1,7 @@
2015-02-04 Kelvin White <kwhite@gnu.org>
* MAINTAINERS: Add myself to section 2
2015-02-02 Glenn Morris <rgm@gnu.org> 2015-02-02 Glenn Morris <rgm@gnu.org>
* admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address

5
admin/MAINTAINERS
View file

@ -78,6 +78,11 @@ Bastien Guerry
2. 2.
============================================================================== ==============================================================================
Kelvin White
ERC
lisp/erc/*
doc/misc/erc.texi
Eli Zaretskii Eli Zaretskii
doc/* doc/*
lispref/* lispref/*

5
doc/misc/ChangeLog
View file

@ -1,3 +1,8 @@
2015-02-04 Kelvin White <kwhite@gnu.org>
* erc.texi (Advanced Usage, Options): Add descriptions and examples
for erc-format-nick-function and erc-rename-buffers options.
2014-12-29 Michael Albinus <michael.albinus@gmx.de> 2014-12-29 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.2.11. Sync with Tramp 2.2.11.

31
doc/misc/erc.texi
View file

@ -588,6 +588,16 @@ In the latter case, if the first nick in the list is already in use,
other nicks are tried in the list order. other nicks are tried in the list order.
@end defopt @end defopt
@defopt erc-format-nick-function
A function to format a nickname for message display
You can set this to @code{erc-format-@OA@nick} to display user mode prefix
@end defopt
@example
(setq erc-format-nick-function 'erc-format-@@nick)
@end example
@defopt erc-nick-uniquifier @defopt erc-nick-uniquifier
The string to append to the nick if it is already in use. The string to append to the nick if it is already in use.
@end defopt @end defopt
@ -657,13 +667,6 @@ your Emacs configuration file. Everything after the @code{(require
@lisp @lisp
;;; Sample ERC configuration ;;; Sample ERC configuration
;; Add the ERC directory to load path -- you don't need this if you are
;; using the version of ERC that comes with Emacs
(add-to-list 'load-path "~/elisp/erc")
;; Load ERC
(require 'erc)
;; Load authentication info from an external source. Put sensitive ;; Load authentication info from an external source. Put sensitive
;; passwords and the like in here. ;; passwords and the like in here.
(load "~/.emacs.d/.erc-auth") (load "~/.emacs.d/.erc-auth")
@ -712,6 +715,12 @@ stuff, to the current ERC buffer."
;; Join the #emacs and #erc channels whenever connecting to Freenode. ;; Join the #emacs and #erc channels whenever connecting to Freenode.
(setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc"))) (setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
;; Rename server buffers to reflect the current network name instead
;; of SERVER:PORT. (e.g. "freenode" instead of "irc.freenode.net:6667"). This
;; is useful when using a bouncer like ZNC where you have multiple
;; connections to the same server.
(setq erc-rename-buffers t)
;; Interpret mIRC-style color commands in IRC chats ;; Interpret mIRC-style color commands in IRC chats
(setq erc-interpret-mirc-color t) (setq erc-interpret-mirc-color t)
@ -750,6 +759,14 @@ lurkers. The function @code{erc-lurker-p} determines whether a given
nickname is considered a lurker. nickname is considered a lurker.
@end defopt @end defopt
@defopt erc-rename-buffers
If non, @code{nil}, this will rename server buffers to reflect the
current network name instead of IP:PORT
@example
(setq erc-rename-buffers t)
@end example
@end defopt
@node Getting Help and Reporting Bugs @node Getting Help and Reporting Bugs
@chapter Getting Help and Reporting Bugs @chapter Getting Help and Reporting Bugs