[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 c648717: Update ERC docs and update MAINTANERS to
From: |
Kelvin White |
Subject: |
[Emacs-diffs] emacs-24 c648717: Update ERC docs and update MAINTANERS to include myself |
Date: |
Wed, 04 Feb 2015 16:23:22 +0000 |
branch: emacs-24
commit c6487170e39e5b58872e935c95e8d033554501f7
Author: kwhite <address@hidden>
Commit: kwhite <address@hidden>
Update ERC docs and update MAINTANERS to include myself
---
admin/ChangeLog | 4 ++++
admin/MAINTAINERS | 5 +++++
doc/misc/ChangeLog | 5 +++++
doc/misc/erc.texi | 31 ++++++++++++++++++++++++-------
4 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 88d9965..0f70469 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-04 Kelvin White <address@hidden>
+
+ * MAINTAINERS: Add myself to section 2
+
2015-02-02 Glenn Morris <address@hidden>
* admin.el (manual-meta-string): Use address@hidden email address
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 1a5c641..04942a8 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -78,6 +78,11 @@ Bastien Guerry
2.
==============================================================================
+Kelvin White
+ ERC
+ lisp/erc/*
+ doc/misc/erc.texi
+
Eli Zaretskii
doc/*
lispref/*
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 71469b5..616b357 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-04 Kelvin White <address@hidden>
+
+ * erc.texi (Advanced Usage, Options): Add descriptions and examples
+ for erc-format-nick-function and erc-rename-buffers options.
+
2014-12-29 Michael Albinus <address@hidden>
Sync with Tramp 2.2.11.
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index ffb8cd6..866d848 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -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.
@end defopt
address@hidden erc-format-nick-function
+A function to format a nickname for message display
+
+You can set this to @address@hidden@nick} to display user mode prefix
address@hidden defopt
+
address@hidden
+(setq erc-format-nick-function 'erc-format-@@nick)
address@hidden example
+
@defopt erc-nick-uniquifier
The string to append to the nick if it is already in use.
@end defopt
@@ -657,13 +667,6 @@ your Emacs configuration file. Everything after the
@code{(require
@lisp
;;; 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
;; passwords and the like in here.
(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.
(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
(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.
@end defopt
address@hidden erc-rename-buffers
+If non, @code{nil}, this will rename server buffers to reflect the
+current network name instead of IP:PORT
+
address@hidden
+(setq erc-rename-buffers t)
address@hidden example
address@hidden defopt
@node Getting Help and Reporting Bugs
@chapter Getting Help and Reporting Bugs
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 c648717: Update ERC docs and update MAINTANERS to include myself,
Kelvin White <=