Merge from trunk.

1 files changed, 20 insertions, 0 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 34aa015d7ac..06c6d42ed39 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,23 @@
+2012-04-11  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * erc-services.el (erc-nickserv-passwords): Don't display the
+        password (bug#4459).
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * erc-join.el (erc-server-join-channel): New function to look up
+        the channel password via auth-source.
+        (erc-autojoin-channels): Use it.
+        (erc-autojoin-after-ident): Ditto.
+        (erc-autojoin-channels-alist): Mention auth-source.
+
+2012-04-10  Deniz Dogan  <deniz@dogan.se>  (tiny change)
+
+        * erc.el (erc-display-prompt): Adds the field text property to the
+        ERC prompt.  This allows users to use `kill-whole-line' to kill
+        all text back to the prompt given that it's on a single line
+        (bug#10841).
+
 2012-04-09  Chong Yidong  <cyd@gnu.org>
 
         * erc.el (erc-cmd-SET): Call custom-variable-p instead of