* 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 cb799f6..92ce2f7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * xdisp.c (redisplay_window): Remove inner local variable
+       because the outer shadowed one has the same meaning.
+
 2012-12-24  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * 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 cbecf55..1eb5146 100644 (file)
--- 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);