[Emacs-diffs] /srv/bzr/emacs/trunk r111323: * xdisp.c (redisplay_window): Remove inner local variable

[Dmitry Antipov]

------------------------------------------------------------
revno: 111323
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-25 15:37:21 +0400
message:
  * xdisp.c (redisplay_window): Remove inner local variable
  because the outer shadowed one has the same meaning.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-24 12:21:42 +0000
+++ b/src/ChangeLog     2012-12-25 11:37:21 +0000
@@ -1,3 +1,8 @@
+2012-12-25  Dmitry Antipov  <address@hidden>
+
+       * xdisp.c (redisplay_window): Remove inner local variable
+       because the outer shadowed one has the same meaning.
+
 2012-12-24  Dmitry Antipov  <address@hidden>
 
        * 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.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-12-24 12:21:42 +0000
+++ b/src/xdisp.c       2012-12-25 11:37:21 +0000
@@ -15649,7 +15649,6 @@
          /* 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);