diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2019-06-16 13:51:20 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2019-06-22 19:16:27 -0400 |
| commit | 96ebbf44b076b165943caefc1bbb0ff4c0f12b6b (patch) | |
| tree | 85e327083697646704ba798d9a1b6ba081af4777 | |
| parent | f4f165f782249fd41ad66c42415e81d64f9ca685 (diff) | |
| download | emacs-96ebbf44b076b165943caefc1bbb0ff4c0f12b6b.tar.gz | |
* lisp/net/rcirc.el (rcirc-prompt-for-encryption): Simplify.
| -rw-r--r-- | lisp/net/rcirc.el | 9 |
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." (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. |