From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 7 Mar 2011 06:39:56 +0000 (-0800)
Subject: * xdisp.c (redisplay_window): Rename local to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~73
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8868a2381e0ae9d40d5b9f21f38a29822ec2fe2a;p=emacs.git

* xdisp.c (redisplay_window): Rename local to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 90722187e6c..95cc4a5d633 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -14,6 +14,8 @@
 
 	* lisp.h (IF_LINT): New macro, copied from ../lib-src/emacsclient.c.
 
+	* xdisp.c (redisplay_window): Rename local to avoid shadowing.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
diff --git a/src/xdisp.c b/src/xdisp.c
index 858a0f74fb1..f2477a2eca5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14163,11 +14163,11 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
     {
       /* The function returns -1 if new fonts were loaded, 1 if
 	 successful, 0 if not successful.  */
-      int rc = try_scrolling (window, just_this_one_p,
+      int ss = try_scrolling (window, just_this_one_p,
 			      scroll_conservatively,
 			      emacs_scroll_step,
 			      temp_scroll_step, last_line_misfit);
-      switch (rc)
+      switch (ss)
 	{
 	case SCROLLING_SUCCESS:
 	  goto done;