Mercurial > emacs
changeset 11719:9238e21a6f09
(prepare_menu_bars): Clear size-change flag before running
size-change functions.
(scroll_step, debug_end_pos, line_number_display_limit): Now static.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 06 May 1995 08:00:08 +0000 |
| parents | e8bb2ca38f6d |
| children | f21ea087b1d8 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sat May 06 04:34:53 1995 +0000 +++ b/src/xdisp.c Sat May 06 08:00:08 1995 +0000 @@ -125,7 +125,7 @@ /* If cursor motion alone moves point off frame, Try scrolling this many lines up or down if that will bring it back. */ -int scroll_step; +static int scroll_step; /* Nonzero if try_window_id has made blank lines at window bottom since the last redisplay that paused */ @@ -143,7 +143,7 @@ static int cursor_vpos; static int cursor_hpos; -int debug_end_pos; +static int debug_end_pos; /* Nonzero means display mode line highlighted */ int mode_line_inverse_video; @@ -212,7 +212,7 @@ int line_number_displayed; /* Maximum buffer size for which to display line numbers. */ -int line_number_display_limit; +static int line_number_display_limit; /* Number of lines to keep in the message log buffer. t means infinite. nil means don't log at all. */ @@ -675,6 +675,8 @@ if (FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame))) { Lisp_Object functions; + /* Clear flag first in case we get error below. */ + FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)) = 0; functions = Vwindow_size_change_functions; GCPRO2 (tail, functions); while (CONSP (functions)) @@ -683,7 +685,6 @@ functions = XCONS (functions)->cdr; } UNGCPRO; - FRAME_WINDOW_SIZES_CHANGED (XFRAME (frame)) = 0; } GCPRO1 (tail); update_menu_bar (XFRAME (frame)); @@ -1551,7 +1552,8 @@ goto scroll_fail; } - pos = *vmotion (startp, PT < startp ? - scroll_step : scroll_step, + pos = *vmotion (startp, + (PT < startp ? - scroll_step : scroll_step), width, hscroll, window); if (PT >= pos.bufpos)