diff options
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 36050ac649e..bc9a956994a 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -217,6 +217,10 @@ Lisp_Object Vscroll_preserve_screen_position; | |||
| 217 | 217 | ||
| 218 | int window_deletion_count; | 218 | int window_deletion_count; |
| 219 | 219 | ||
| 220 | /* Used by the function window_scroll_pixel_based */ | ||
| 221 | |||
| 222 | static int preserve_y; | ||
| 223 | |||
| 220 | #if 0 /* This isn't used anywhere. */ | 224 | #if 0 /* This isn't used anywhere. */ |
| 221 | /* Nonzero means we can split a frame even if it is "unsplittable". */ | 225 | /* Nonzero means we can split a frame even if it is "unsplittable". */ |
| 222 | static int inhibit_frame_unsplittable; | 226 | static int inhibit_frame_unsplittable; |
| @@ -4726,7 +4730,6 @@ window_scroll_pixel_based (window, n, whole, noerror) | |||
| 4726 | int this_scroll_margin; | 4730 | int this_scroll_margin; |
| 4727 | /* True if we fiddled the window vscroll field without really scrolling. */ | 4731 | /* True if we fiddled the window vscroll field without really scrolling. */ |
| 4728 | int vscrolled = 0; | 4732 | int vscrolled = 0; |
| 4729 | static int preserve_y = -1; | ||
| 4730 | 4733 | ||
| 4731 | SET_TEXT_POS_FROM_MARKER (start, w->start); | 4734 | SET_TEXT_POS_FROM_MARKER (start, w->start); |
| 4732 | 4735 | ||
| @@ -7024,6 +7027,8 @@ syms_of_window () | |||
| 7024 | minibuf_selected_window = Qnil; | 7027 | minibuf_selected_window = Qnil; |
| 7025 | staticpro (&minibuf_selected_window); | 7028 | staticpro (&minibuf_selected_window); |
| 7026 | 7029 | ||
| 7030 | preserve_y = -1; | ||
| 7031 | |||
| 7027 | DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, | 7032 | DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, |
| 7028 | doc: /* Non-nil means call as function to display a help buffer. | 7033 | doc: /* Non-nil means call as function to display a help buffer. |
| 7029 | The function is called with one argument, the buffer to be displayed. | 7034 | The function is called with one argument, the buffer to be displayed. |