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

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a236441a349..b82b56dd166 100644
--- 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 0d02688beed..47085af85f0 100644
--- 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))