Query encryption using yes-or-no-p

* rcirc.el (rcirc-prompt-for-encryption): Replace completing-read
  prompt with yes-or-no-p

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 9e14d1b12acadddb1990d64b85dd07bb6b502102..6c27acfadf70e6e70f92b3bc0b446e1a7fdef763 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -691,12 +691,9 @@ that are joined after authentication."
 (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 ((choices '("plain" "tls"))
-        (default (or (plist-get server-plist :encryption)
-                     "plain")))
-    (intern
-     (completing-read (format-prompt "Encryption" default)
-                      choices nil t nil nil default))))
+  (if (or (eq (plist-get server-plist :encryption) 'plain)
+          (yes-or-no-p "Encrypt connection?"))
+      'tls 'plain))
 
 (defun rcirc-keepalive ()
   "Send keep alive pings to active rcirc processes.