* lisp/net/rcirc.el (rcirc-handler-001): Remove useless

with-rcirc-process-buffer.
(rcirc-check-auth-status): Swap arguments to string-match.

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b3b5b6801b..251547b617d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-09  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+
+        * net/rcirc.el (rcirc-handler-001): Remove useless
+        with-rcirc-process-buffer.
+        (rcirc-check-auth-status): Swap arguments to string-match.
+
 2011-03-09  Glenn Morris  <rgm@gnu.org>
 
         * shell.el (shell-mode):
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 41e09540631..71aa0dd22bc 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2449,8 +2449,7 @@ keywords when no KEYWORD is given."
     (if rcirc-auto-authenticate-flag
         (if rcirc-authenticate-before-join
             (progn
-              (with-rcirc-process-buffer process
-                (add-hook 'rcirc-authenticated-hook 'rcirc-join-channels-post-auth t t))
+              (add-hook 'rcirc-authenticated-hook 'rcirc-join-channels-post-auth t t)
               (rcirc-authenticate))
           (rcirc-authenticate)
           (rcirc-join-channels process rcirc-startup-channels))
@@ -2515,7 +2514,7 @@ the only argument."
                (and ;; quakenet
                 (string= sender "Q")
                 (string= target rcirc-nick)
-                (string-match message "\\`You are now logged in as .+\\.\\'")))
+                (string-match "\\`You are now logged in as .+\\.\\'" message)))
           (setq rcirc-user-authenticated t)
           (run-hook-with-args 'rcirc-authenticated-hook process)
           (remove-hook 'rcirc-authenticated-hook 'rcirc-join-channels-post-auth t))))))