From: Noam Postavsky <npostavs@gmail.com>
Date: Sun, 16 Jun 2019 17:51:20 +0000 (-0400)
Subject: * lisp/net/rcirc.el (rcirc-prompt-for-encryption): Simplify.
X-Git-Tag: emacs-27.0.90~2314
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96ebbf44b076b165943caefc1bbb0ff4c0f12b6b;p=emacs.git

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

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index dae372f96eb..8926772b944 100644
--- 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.