Merge from origin/emacs-24

c0ba590 Fix vertical-motion and posn-at-point when word-wrap is
a323b93 Better multi-line input support in comint.el
008a04a todo-mode.el: Restore point on setting item done  (Bug#19727)
9615c0d doc/misc/erc.texi: fix typo
c648717 Update ERC docs and update MAINTANERS to include myself
d825f66 Fix filling circle/ellipse in Artist Mode  (Bug#19763)

Conflicts:
	admin/ChangeLog
	doc/misc/ChangeLog
	doc/misc/erc.texi
	lisp/ChangeLog
	src/ChangeLog

2 files changed, 8 insertions, 9 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4e9c119379d..c00cb2f722a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-03  Kelvin White  <kwhite@gnu.org>
+
+        * erc.texi (Advanced Usage, Options): Add descriptions and examples
+        for erc-format-nick-function and erc-rename-buffers options.
+        (Connecting): fix typo
+
+2015-03-03  Michael Albinus  <michael.albinus@gmx.de>
 2015-03-02  Daniel Colascione  <dancol@dancol.org>
 
         * cl.texi (Iteration Clauses): Mention iterator support.
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index aaa88ce803b..2f4ffae87c1 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -667,14 +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 -- again, you don't need this if you are using the version
-;; of ERC that comes with Emacs
-(require 'erc)
-
 ;; Load authentication info from an external source.  Put sensitive
 ;; passwords and the like in here.
 (load "~/.emacs.d/.erc-auth")
@@ -724,7 +716,7 @@ stuff, to the current ERC buffer."
 (setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
 
 ;; Rename server buffers to reflect the current network name instead
-;; of IP:PORT. (e.g. "freenode" instead of "84.240.3.129:6667"). This
+;; 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)