* lisp/net/rcirc.el (rcirc-prompt-for-encryption): Simplify.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index dae372f96eb8853b8b1229a33308f48af9ff7e63..8926772b944a30c70221a45f676123e4eaa071b4 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -620,13 +620,12 @@ If ARG is non-nil, instead prompt for connection parameters."
 (defun rcirc-prompt-for-encryption (server-plist)
   "Prompt the user for the encryption method to use.
 SERVER-PLIST is the property list for the server."
-  (let ((msg "Encryption (default %s): ")
-        (choices '("plain" "tls"))
+  (let ((choices '("plain" "tls"))
         (default (or (plist-get server-plist :encryption)
-                     'plain)))
+                     "plain")))
     (intern
-     (completing-read (format msg default)
-                      choices nil t nil nil (symbol-name default)))))
+     (completing-read (format "Encryption (default %s): " default)
+                      choices nil t nil nil default))))
 
 (defun rcirc-keepalive ()
   "Send keep alive pings to active rcirc processes.