From: Deniz Dogan Date: Wed, 9 Mar 2011 10:45:19 +0000 (+0100) Subject: * lisp/net/rcirc.el (rcirc-handler-001): Remove useless X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~629 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c47971d7a31d28dc49a39cccc2523d1e3ed08b10;p=emacs.git * lisp/net/rcirc.el (rcirc-handler-001): Remove useless with-rcirc-process-buffer. (rcirc-check-auth-status): Swap arguments to string-match. --- 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 + + * 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 * 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))))))