aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/net/rcirc.el9
1 files changed, 4 insertions, 5 deletions
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."
620(defun rcirc-prompt-for-encryption (server-plist) 620(defun rcirc-prompt-for-encryption (server-plist)
621 "Prompt the user for the encryption method to use. 621 "Prompt the user for the encryption method to use.
622SERVER-PLIST is the property list for the server." 622SERVER-PLIST is the property list for the server."
623 (let ((msg "Encryption (default %s): ") 623 (let ((choices '("plain" "tls"))
624 (choices '("plain" "tls"))
625 (default (or (plist-get server-plist :encryption) 624 (default (or (plist-get server-plist :encryption)
626 'plain))) 625 "plain")))
627 (intern 626 (intern
628 (completing-read (format msg default) 627 (completing-read (format "Encryption (default %s): " default)
629 choices nil t nil nil (symbol-name default))))) 628 choices nil t nil nil default))))
630 629
631(defun rcirc-keepalive () 630(defun rcirc-keepalive ()
632 "Send keep alive pings to active rcirc processes. 631 "Send keep alive pings to active rcirc processes.