aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2011-03-07 13:03:22 +0100
committerDeniz Dogan2011-03-07 13:03:22 +0100
commitfa7062f6539a628343802d7d7dbf86befe3c2626 (patch)
treea8d4e0170d155bb711d17732262eb13e3ba2f206
parentcf715c3c952706b13fe4a9a9279739b7ed480a15 (diff)
downloademacs-fa7062f6539a628343802d7d7dbf86befe3c2626.tar.gz
emacs-fa7062f6539a628343802d7d7dbf86befe3c2626.zip
* lisp/net/rcirc.el (rcirc-connect): Fix PASS bug.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ff65b16c6d..d23bb9e650e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-03-07 Deniz Dogan <deniz.a.m.dogan@gmail.com>
2
3 * net/rcirc.el (rcirc-connect): Fix PASS bug.
4
12011-03-07 Glenn Morris <rgm@gnu.org> 52011-03-07 Glenn Morris <rgm@gnu.org>
2 6
3 * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. 7 * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 1e3ee91092d..41e09540631 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -548,7 +548,7 @@ If ARG is non-nil, instead prompt for connection parameters."
548 (add-hook 'auto-save-hook 'rcirc-log-write) 548 (add-hook 'auto-save-hook 'rcirc-log-write)
549 549
550 ;; identify 550 ;; identify
551 (when password 551 (unless (zerop (length password))
552 (rcirc-send-string process (concat "PASS " password))) 552 (rcirc-send-string process (concat "PASS " password)))
553 (rcirc-send-string process (concat "NICK " nick)) 553 (rcirc-send-string process (concat "NICK " nick))
554 (rcirc-send-string process (concat "USER " user-name 554 (rcirc-send-string process (concat "USER " user-name