[Emacs-diffs] /srv/bzr/emacs/trunk r103133: * lisp/net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process

[Deniz Dogan]

------------------------------------------------------------
revno: 103133
committer: Deniz Dogan <address@hidden>
branch nick: emacs-trunk
timestamp: Sat 2011-02-05 22:07:26 +0100
message:
  * lisp/net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process
  (Bug#6386).
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-05 19:46:47 +0000
+++ b/lisp/ChangeLog    2011-02-05 21:07:26 +0000
@@ -1,3 +1,8 @@
+2011-02-05  Deniz Dogan  <address@hidden>
+
+       * net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process
+       (Bug#6386).
+
 2011-02-05  Stefan Monnier  <address@hidden>
 
        * progmodes/sh-script.el (sh-here-doc-open-re): Don't rely on the

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-02-03 07:14:02 +0000
+++ b/lisp/net/rcirc.el 2011-02-05 21:07:26 +0000
@@ -2455,7 +2455,10 @@
                                     (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 "")