diff options
| author | Deniz Dogan <deniz@dogan.se> | 2011-05-29 07:42:00 +0200 |
|---|---|---|
| committer | Deniz Dogan <deniz@dogan.se> | 2011-05-29 07:42:00 +0200 |
| commit | 80aec7804779b5567d40ad90116dadf61508aa91 (patch) | |
| tree | 3cf28be69f9033129b1e16d5c700d7cad7950e8c /lisp/net/rcirc.el | |
| parent | 0196f88a60a053e435a65e3c418e11866bf4ae22 (diff) | |
| download | emacs-80aec7804779b5567d40ad90116dadf61508aa91.tar.gz emacs-80aec7804779b5567d40ad90116dadf61508aa91.tar.bz2 emacs-80aec7804779b5567d40ad90116dadf61508aa91.zip | |
* net/rcirc.el (rcirc): Use the user's stored encryption method by default.
Diffstat (limited to 'lisp/net/rcirc.el')
| -rw-r--r-- | lisp/net/rcirc.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 0d02688beed..47085af85f0 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -456,7 +456,12 @@ If ARG is non-nil, instead prompt for connection parameters." (encryption (intern (completing-read "Encryption (default plain): " '("plain" "tls") - nil t nil nil "plain")))) + nil t + (let ((choice (plist-get server-plist + :encryption))) + (when choice + (symbol-name choice))) + nil "plain")))) (rcirc-connect server port nick user-name rcirc-default-full-name channels password encryption)) |