[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108617: erc: use auth-source

[Julien Danjou]

------------------------------------------------------------
revno: 108617
committer: Julien Danjou <address@hidden>
branch nick: trunk
timestamp: Fri 2012-06-15 16:47:31 +0200
message:
  erc: use auth-source
  
  * erc.el (erc-open): Use `auth-source' for password retrieval when
    possible.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-06-12 05:47:14 +0000
+++ b/lisp/erc/ChangeLog        2012-06-15 14:47:31 +0000
@@ -1,3 +1,8 @@
+2012-06-15  Julien Danjou  <address@hidden>
+
+       * erc.el (erc-open): Use `auth-source' for password retrieval when
+       possible.
+
 2012-06-12  Chong Yidong  <address@hidden>
 
        * erc-dcc.el (erc-dcc-chat-filter-functions): Rename from

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2012-06-08 16:39:49 +0000
+++ b/lisp/erc/erc.el   2012-06-15 14:47:31 +0000
@@ -71,6 +71,7 @@
 (require 'font-lock)
 (require 'pp)
 (require 'thingatpt)
+(require 'auth-source)
 (require 'erc-compat)
 
 (defvar erc-official-location
@@ -2006,7 +2007,19 @@
     ;; The local copy of `erc-nick' - the list of nicks to choose
     (setq erc-default-nicks (if (consp erc-nick) erc-nick (list erc-nick)))
     ;; password stuff
-    (setq erc-session-password passwd)
+    (setq erc-session-password (or passwd
+                                  (let ((secret
+                                         (plist-get
+                                          (nth 0
+                                               (auth-source-search :host server
+                                                                   :max 1
+                                                                   :user nick
+                                                                   :port port
+                                                                   :require 
'(:secret)))
+                                          :secret)))
+                                    (if (functionp secret)
+                                        (funcall secret)
+                                      secret))))
     ;; debug output buffer
     (setq erc-dbuf
          (when erc-log-p