From 80aec7804779b5567d40ad90116dadf61508aa91 Mon Sep 17 00:00:00 2001 From: Deniz Dogan Date: Sun, 29 May 2011 07:42:00 +0200 Subject: [PATCH] * net/rcirc.el (rcirc): Use the user's stored encryption method by default. --- lisp/ChangeLog | 5 +++++ lisp/net/rcirc.el | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a236441a349..b82b56dd166 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-29 Deniz Dogan + + * net/rcirc.el (rcirc): Use the user's stored encryption method by + default. + 2011-05-29 Chong Yidong * select.el: Don't perform clipboard-manager saving in hooks; 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)) -- 2.39.2