From: Deniz Dogan <deniz@dogan.se>
Date: Sat, 3 Sep 2011 17:40:08 +0000 (+0200)
Subject: * lisp/net/rcirc.el (rcirc-print): Simplify code for rcirc-scroll-show-maximum-output... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~155^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d37e5c877713210af39d81a7cf80335b79eae820;p=emacs.git

* lisp/net/rcirc.el (rcirc-print): Simplify code for rcirc-scroll-show-maximum-output.  There is no need to walk through all windows to find the right one.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dae4cbf6609..656bf8485e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-03  Deniz Dogan  <deniz@dogan.se>
+
+	* net/rcirc.el (rcirc-print): Simplify code for
+	rcirc-scroll-show-maximum-output.  There is no need to walk
+	through all windows to find the right one.
+
 2011-09-03  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* help.el (help-return-method): Doc fix.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 71b3fe0c4a1..06bbfb0b78c 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1556,18 +1556,16 @@ record activity."
 
 	  ;; keep window on bottom line if it was already there
 	  (when rcirc-scroll-show-maximum-output
-	    (walk-windows (lambda (w)
-			    (when (eq (window-buffer w) (current-buffer))
-			      (with-current-buffer (window-buffer w)
-				(when (eq major-mode 'rcirc-mode)
-				  (with-selected-window w
-				    (when (<= (- (window-height)
-						 (count-screen-lines (window-point)
-								     (window-start))
-						 1)
-					      0)
-				      (recenter -1)))))))
-				  nil t))
+	    (let ((window (get-buffer-window)))
+	      (when window
+		(with-selected-window window
+		  (when (eq major-mode 'rcirc-mode)
+		    (when (<= (- (window-height)
+				 (count-screen-lines (window-point)
+						     (window-start))
+				 1)
+			      0)
+		      (recenter -1)))))))
 
 	  ;; flush undo (can we do something smarter here?)
 	  (buffer-disable-undo)