bug#3037: 23.0.92; rcirc picks incorrect connection settings

bug#3037: 23.0.92; rcirc picks incorrect connection settings

[Chong Yidong]

Hi Ryan,

Could you evaluate the bug report for RCIRC at the following URL?  Is
the patch attached in the report OK to commit?

http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3037

bug#3037: 23.0.92; rcirc picks incorrect connection settings

[Ryan Yeske]

Chong Yidong <cyd@stupidchicken.com> writes:

> Hi Ryan,
>
> Could you evaluate the bug report for RCIRC at the following URL?  Is
> the patch attached in the report OK to commit?
>
> http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3037

Yes, that is exactly the fix for that issue.

bug#3037: 23.0.92; rcirc picks incorrect connection settings

[Yann Hodique]

When using `rcirc' with argument (prompt for connection parameters), the
global default values for :port, :nick and :channels are proposed
instead of the server-specific ones. 

Reason is that current code tries to get properties 'port, 'nick
and 'channels, which is not correct.
Following patch fixes this issue.

Yann.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index f63237f..1f31284 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -375,16 +375,16 @@ If ARG is non-nil, instead prompt for connection parameters."
             (server-plist (cdr (assoc-string server rcirc-server-alist)))
             (port (read-string "IRC Port: "
                                (number-to-string
-                                (or (plist-get server-plist 'port)
+                                (or (plist-get server-plist :port)
                                     rcirc-default-port))))
             (nick (read-string "IRC Nick: "
-                               (or (plist-get server-plist 'nick)
+                               (or (plist-get server-plist :nick)
                                    rcirc-default-nick)))
             (channels (split-string
                        (read-string "IRC Channels: "
                                     (mapconcat 'identity
                                                (plist-get server-plist
-                                                          'channels)
+                                                          :channels)
                                                " "))
                        "[, ]+" t)))
        (rcirc-connect server port nick rcirc-default-user-name

-- 
"Once more the drama begins."

-The Emperor Paul Muad'dib on his ascension to the Lion Throne