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

lisp/ChangeLog

+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;

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))