* net/rcirc.el (rcirc): Use the user's stored encryption method by default.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a236441a349e02f61f908a86a905a542f5267481..b82b56dd166ddc1fdbd532318333c0096049407d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-29  Deniz Dogan  <deniz@dogan.se>
+
+       * net/rcirc.el (rcirc): Use the user's stored encryption method by
+       default.
+
 2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
 
        * select.el: Don't perform clipboard-manager saving in hooks;

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 0d02688beed4506529897d6d4bb6738afa9670da..47085af85f00ebfa09c9d6066f3277233335d4ac 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -456,7 +456,12 @@ If ARG is non-nil, instead prompt for connection parameters."
              (encryption
               (intern (completing-read "Encryption (default plain): "
                                        '("plain" "tls")
-                                       nil t nil nil "plain"))))
+                                       nil t
+                                       (let ((choice (plist-get server-plist
+                                                                :encryption)))
+                                         (when choice
+                                           (symbol-name choice)))
+                                       nil "plain"))))
        (rcirc-connect server port nick user-name
                       rcirc-default-full-name
                       channels password encryption))