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

diff --git a/src/ChangeLog b/src/ChangeLog
index 90722187e6c54474ced6725fee07a0cfa5acf87f..95cc4a5d633323b385788f1aa73683e9f09e2ef6 100644 (file)
--- 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 858a0f74fb12112a54fe441e94e5cf2db8611211..f2477a2eca588635ef93276e10f0d249afe7bccc 100644 (file)
--- 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;