* lisp/net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process

(Bug#6386).

2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c514d535a7..5625fd4dc16 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-05  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+
+        * net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process
+        (Bug#6386).
+
 2011-02-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/sh-script.el (sh-here-doc-open-re): Don't rely on the
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 0e44508641b..87db130f1ea 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2455,7 +2455,10 @@ keywords when no KEYWORD is given."
                                      (rcirc-elapsed-lines process sender channel)))
                                 (when (and last-activity-lines
                                            (< last-activity-lines rcirc-omit-threshold))
-                                  (rcirc-last-line process sender channel)))))
+                                  (rcirc-last-line process sender channel))))
+      ;; reset mode-line-process in case joining a channel with an
+      ;; already open buffer (after getting kicked e.g.)
+      (setq mode-line-process nil))
 
     (rcirc-print process sender "JOIN" channel "")