* window.c (set_window_buffer): Field vscroll is an int, not a lisp object.

diff --git a/src/ChangeLog b/src/ChangeLog
index 64a4baa7dad86a79646bcf5122a8536bde4361df..465b1e2cd899b27616d47aa800849f02baf40369 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-28  Ken Raeburn  <raeburn@gnu.org>
+
+       * window.c (set_window_buffer): Field vscroll is an int, not a
+       lisp object.
+
 2001-02-28  Gerd Moellmann  <gerd@gnu.org>
 
        * xterm.c (x_set_window_size): Don't use `None' with widgets; use

diff --git a/src/window.c b/src/window.c
index a7e981fea2c3b6f47eadfc04d5c116f8d4651f81..71e490724b61ac16d60f7b1d9193d6cee4889d4c 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2631,7 +2631,7 @@ set_window_buffer (window, buffer, run_hooks_p)
   bzero (&w->last_cursor, sizeof w->last_cursor);
   w->window_end_valid = Qnil;
   w->hscroll = w->min_hscroll = make_number (0);
-  w->vscroll = make_number (0);
+  w->vscroll = 0;
   set_marker_both (w->pointm, buffer, BUF_PT (b), BUF_PT_BYTE (b));
   set_marker_restricted (w->start,
                         make_number (b->last_window_start),