bug#3037: 23.0.92; rcirc picks incorrect connection settings

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

bug#3037: marked as done (23.0.92; rcirc picks incorrect connection settings)

[Emacs bug Tracking System]

[-- Attachment #1: Type: text/plain, Size: 886 bytes --]


Your message dated Fri, 17 Apr 2009 23:47:07 -0400
with message-id <87eivqipxg.fsf@cyd.mit.edu>
and subject line Re: 23.0.92; rcirc picks incorrect connection settings
has caused the Emacs bug report #3037,
regarding 23.0.92; rcirc picks incorrect connection settings
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@emacsbugs.donarmstrong.com
immediately.)


-- 
3037: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3037
Emacs Bug Tracking System
Contact owner@emacsbugs.donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 5848 bytes --]

From: Yann Hodique <yann.hodique@gmail.com>
To: emacs-pretest-bug@gnu.org
Subject: 23.0.92; rcirc picks incorrect connection settings
Date: Fri, 17 Apr 2009 17:48:19 +0200
Message-ID: <8763h39t8c.fsf@gmail.com>

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



[-- Attachment #3: Type: message/rfc822, Size: 1471 bytes --]

From: Chong Yidong <cyd@stupidchicken.com>
To: Yann Hodique <yann.hodique@gmail.com>
Cc: Ryan Yeske <rcyeske@gmail.com>, 3037-done@emacsbugs.donarmstrong.com
Subject: Re: 23.0.92; rcirc picks incorrect connection settings
Date: Fri, 17 Apr 2009 23:47:07 -0400
Message-ID: <87eivqipxg.fsf@cyd.mit.edu>

> 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.

I've checked in your patch.  Thanks.

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.