diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f5a26ed8482..a98aa1ba52d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2011-06-05 Deniz Dogan <deniz@dogan.se> + * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced + in last change. + +2011-06-05 Deniz Dogan <deniz@dogan.se> + * net/rcirc.el (rcirc-prompt-for-encryption): New function. (rcirc): Use it to prompt for encryption. diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index bf4faba5197..70190867e89 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -594,10 +594,10 @@ SERVER-PLIST is the property list for the server." (let ((msg "Encryption (default %s): ") (choices '("plain" "tls")) (default (or (plist-get server-plist :encryption) - "plain"))) + 'plain))) (intern (completing-read (format msg default) - choices nil t "" nil default)))) + choices nil t nil nil (symbol-name default))))) (defun rcirc-keepalive () "Send keep alive pings to active rcirc processes. |