[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 96ebbf4 1/4: * lisp/net/rcirc.el (rcirc-prompt-for-
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master 96ebbf4 1/4: * lisp/net/rcirc.el (rcirc-prompt-for-encryption): Simplify. |
Date: |
Sat, 22 Jun 2019 19:27:27 -0400 (EDT) |
branch: master
commit 96ebbf44b076b165943caefc1bbb0ff4c0f12b6b
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
* lisp/net/rcirc.el (rcirc-prompt-for-encryption): Simplify.
---
lisp/net/rcirc.el | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index dae372f..8926772 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.