Commit 8868a238 authored by Paul Eggert's avatar Paul Eggert
Browse files

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

parent 07b48fa9
......@@ -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
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment