aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-04-18 03:44:57 +0000
committerChong Yidong2009-04-18 03:44:57 +0000
commitd893706458ae4ea2a9cebdc02ff4bde5869c163d (patch)
treec07758bdfeb330bc2385393e1661dec92c911a23
parent965b9376cfde6ff247695ae277671df58cdcbb7a (diff)
downloademacs-d893706458ae4ea2a9cebdc02ff4bde5869c163d.tar.gz
emacs-d893706458ae4ea2a9cebdc02ff4bde5869c163d.zip
* net/rcirc.el (rcirc): Use correct property names (Bug#3037).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7628f28198..d23d65de93e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-04-18 Yann Hodique <yann.hodique@gmail.com> (tiny change)
2
3 * net/rcirc.el (rcirc): Use correct property names (Bug#3037).
4
12009-04-18 Chong Yidong <cyd@stupidchicken.com> 52009-04-18 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * thingatpt.el (thing-at-point-bounds-of-list-at-point): New 7 * thingatpt.el (thing-at-point-bounds-of-list-at-point): New
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index f63237f58ca..1f312843f08 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."
375 (server-plist (cdr (assoc-string server rcirc-server-alist))) 375 (server-plist (cdr (assoc-string server rcirc-server-alist)))
376 (port (read-string "IRC Port: " 376 (port (read-string "IRC Port: "
377 (number-to-string 377 (number-to-string
378 (or (plist-get server-plist 'port) 378 (or (plist-get server-plist :port)
379 rcirc-default-port)))) 379 rcirc-default-port))))
380 (nick (read-string "IRC Nick: " 380 (nick (read-string "IRC Nick: "
381 (or (plist-get server-plist 'nick) 381 (or (plist-get server-plist :nick)
382 rcirc-default-nick))) 382 rcirc-default-nick)))
383 (channels (split-string 383 (channels (split-string
384 (read-string "IRC Channels: " 384 (read-string "IRC Channels: "
385 (mapconcat 'identity 385 (mapconcat 'identity
386 (plist-get server-plist 386 (plist-get server-plist
387 'channels) 387 :channels)
388 " ")) 388 " "))
389 "[, ]+" t))) 389 "[, ]+" t)))
390 (rcirc-connect server port nick rcirc-default-user-name 390 (rcirc-connect server port nick rcirc-default-user-name