[Emacs-diffs] /srv/bzr/emacs/trunk r104503: * lisp/net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced in last change.

[Deniz Dogan]

------------------------------------------------------------
revno: 104503
committer: Deniz Dogan <address@hidden>
branch nick: emacs-trunk
timestamp: Sun 2011-06-05 21:39:17 +0200
message:
  * lisp/net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced in last 
change.
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-05 19:03:28 +0000
+++ b/lisp/ChangeLog    2011-06-05 19:39:17 +0000
@@ -1,5 +1,10 @@
 2011-06-05  Deniz Dogan  <address@hidden>
 
+       * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced
+       in last change.
+
+2011-06-05  Deniz Dogan  <address@hidden>
+
        * net/rcirc.el (rcirc-prompt-for-encryption): New function.
        (rcirc): Use it to prompt for encryption.
 

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-06-05 19:03:28 +0000
+++ b/lisp/net/rcirc.el 2011-06-05 19:39:17 +0000
@@ -594,10 +594,10 @@
   (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.