From: Dmitry Antipov Date: Tue, 25 Dec 2012 11:37:21 +0000 (+0400) Subject: * xdisp.c (redisplay_window): Remove inner local variable X-Git-Tag: emacs-24.3.90~173^2~7^2~499 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a0d4f34c6575556260d67f97bbb88a9ef757081;p=emacs.git * xdisp.c (redisplay_window): Remove inner local variable because the outer shadowed one has the same meaning. --- diff --git a/src/ChangeLog b/src/ChangeLog index cb799f627d1..92ce2f795d9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-12-25 Dmitry Antipov + + * xdisp.c (redisplay_window): Remove inner local variable + because the outer shadowed one has the same meaning. + 2012-12-24 Dmitry Antipov * buffer.h (BUF_COMPACT): New macro to follow the common style. @@ -94,7 +99,7 @@ (charpos_to_bytepos): Remove. * fileio.c (Finsert_file_contents): Use move_gap_both. * search.c (Freplace_match): Likewise. - * process.c (process_send_region): Likewise. Use convenient + * process.c (process_send_region): Likewise. Use convenient names for byte positions. * lisp.h (charpos_to_bytepos): Remove prototype. * indent.c (scan_for_column): Use CHAR_TO_BYTE. diff --git a/src/xdisp.c b/src/xdisp.c index cbecf558ccc..1eb5146b1ca 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -15649,7 +15649,6 @@ redisplay_window (Lisp_Object window, int just_this_one_p) /* Some people insist on not letting point enter the scroll margin, even though this part handles windows that didn't scroll at all. */ - struct frame *f = XFRAME (w->frame); int margin = min (scroll_margin, WINDOW_TOTAL_LINES (w) / 4); int pixel_margin = margin * FRAME_LINE_HEIGHT (f); bool header_line = WINDOW_WANTS_HEADER_LINE_P (w);