* xdisp.c (redisplay_window): Remove inner local variable

because the outer shadowed one has the same meaning.
This commit is contained in:
Dmitry Antipov 2012-12-25 15:37:21 +04:00
parent 61bbede67c
commit 9a0d4f34c6
2 changed files with 6 additions and 2 deletions

View file

@ -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.

View file

@ -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);