From: Philip Kaludercic <philipk@posteo.net>
Date: Mon, 21 Jun 2021 07:12:25 +0000 (+0200)
Subject: Query encryption using yes-or-no-p
X-Git-Tag: emacs-28.0.90~1748^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b81c97779909275b8b9d36c00d789dceba6f28e5;p=emacs.git

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 9e14d1b12ac..6c27acfadf7 100644
--- 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.