4 files changed, 48 insertions, 3 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
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index da894ba5977..85d1edf6427 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -32,6 +32,7 @@
 ;;; Code:
 
 (require 'erc)
+(require 'auth-source)
 (eval-when-compile (require 'cl))
 
 (defgroup erc-autojoin nil
@@ -56,6 +57,13 @@ Every element in the alist has the form (SERVER . CHANNELS).
 SERVER is a regexp matching the server, and channels is the
 list of channels to join.
 
+If the channel(s) require channel keys for joining, the passwords
+are found via auth-source.  For instance, if you use ~/.authinfo
+as your auth-source backend, then put something like the
+following in that file:
+
+machine irc.example.net login \"#fsf\" password sEcReT
+
 Customize this variable to set the value for your first connect.
 Once you are connected and join and part channels, this alist
 keeps track of what channels you are on, and will join them
@@ -131,7 +139,7 @@ This function is run from `erc-nickserv-identified-hook'."
         (when (string-match (car l) server)
           (dolist (chan (cdr l))
             (unless (erc-member-ignore-case chan joined)
-              (erc-server-send (concat "join " chan))))))))
+              (erc-server-join-channel server chan)))))))
   nil)
 
 (defun erc-autojoin-channels (server nick)
@@ -148,10 +156,25 @@ This function is run from `erc-nickserv-identified-hook'."
     (dolist (l erc-autojoin-channels-alist)
       (when (string-match (car l) server)
         (dolist (chan (cdr l))
-          (erc-server-send (concat "join " chan))))))
+          (erc-server-join-channel server chan)))))
   ;; Return nil to avoid stomping on any other hook funcs.
   nil)
 
+(defun erc-server-join-channel (server channel)
+  (let* ((secret (plist-get (nth 0 (auth-source-search
+                                    :max 1
+                                    :host server
+                                    :port "irc"
+                                    :user channel))
+                            :secret))
+         (password (if (functionp secret)
+                       (funcall secret)
+                     secret)))
+    (erc-server-send (concat "join " channel
+                             (if password
+                                 (concat " " password)
+                               "")))))
+
 (defun erc-autojoin-add (proc parsed)
   "Add the channel being joined to `erc-autojoin-channels-alist'."
   (let* ((chnl (erc-response.contents parsed))
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 66eb341b47a..5986d81efed 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -195,7 +195,8 @@ Example of use:
                 (repeat :tag "Nickname and password"
                         (cons :tag "Identity"
                               (string :tag "Nick")
-                              (string :tag "Password"))))))
+                              (string :tag "Password"
+                                      :secret ?*))))))
 
 ;; Variables:
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 62b701204d1..b79c2fd6c5e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3646,6 +3646,7 @@ If FACE is non-nil, it will be used to propertize the prompt.  If it is nil,
                                      'start-open t ; XEmacs
                                      'rear-nonsticky t ; Emacs
                                      'erc-prompt t
+                                     'field t
                                      'front-sticky t
                                      'read-only t))
         (erc-put-text-property 0 (1- (length prompt))