[Emacs-diffs] /srv/bzr/emacs/trunk r104421: * net/rcirc.el (rcirc): Use the user's stored encryption method by default.

[Deniz Dogan]

------------------------------------------------------------
revno: 104421
committer: Deniz Dogan <address@hidden>
branch nick: emacs-trunk
timestamp: Sun 2011-05-29 07:42:00 +0200
message:
  * net/rcirc.el (rcirc): Use the user's stored encryption method by default.
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-29 00:45:00 +0000
+++ b/lisp/ChangeLog    2011-05-29 05:42:00 +0000
@@ -1,3 +1,8 @@
+2011-05-29  Deniz Dogan  <address@hidden>
+
+       * net/rcirc.el (rcirc): Use the user's stored encryption method by
+       default.
+
 2011-05-29  Chong Yidong  <address@hidden>
 
        * select.el: Don't perform clipboard-manager saving in hooks;

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-05-19 12:38:39 +0000
+++ b/lisp/net/rcirc.el 2011-05-29 05:42:00 +0000
@@ -456,7 +456,12 @@
              (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))