aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn2001-02-28 17:41:06 +0000
committerKen Raeburn2001-02-28 17:41:06 +0000
commit224227d1db3d56b4d8d1971d6b706529b6cdac7e (patch)
treed1460e43c16723b621eb9648743dd92015bcb9ab
parent11ef99b90c6edb328470509dbd295f4be261579f (diff)
downloademacs-224227d1db3d56b4d8d1971d6b706529b6cdac7e.tar.gz
emacs-224227d1db3d56b4d8d1971d6b706529b6cdac7e.zip
* window.c (set_window_buffer): Field vscroll is an int, not a lisp object.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 64a4baa7dad..465b1e2cd89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-02-28 Ken Raeburn <raeburn@gnu.org>
2
3 * window.c (set_window_buffer): Field vscroll is an int, not a
4 lisp object.
5
12001-02-28 Gerd Moellmann <gerd@gnu.org> 62001-02-28 Gerd Moellmann <gerd@gnu.org>
2 7
3 * xterm.c (x_set_window_size): Don't use `None' with widgets; use 8 * xterm.c (x_set_window_size): Don't use `None' with widgets; use
diff --git a/src/window.c b/src/window.c
index a7e981fea2c..71e490724b6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2631,7 +2631,7 @@ set_window_buffer (window, buffer, run_hooks_p)
2631 bzero (&w->last_cursor, sizeof w->last_cursor); 2631 bzero (&w->last_cursor, sizeof w->last_cursor);
2632 w->window_end_valid = Qnil; 2632 w->window_end_valid = Qnil;
2633 w->hscroll = w->min_hscroll = make_number (0); 2633 w->hscroll = w->min_hscroll = make_number (0);
2634 w->vscroll = make_number (0); 2634 w->vscroll = 0;
2635 set_marker_both (w->pointm, buffer, BUF_PT (b), BUF_PT_BYTE (b)); 2635 set_marker_both (w->pointm, buffer, BUF_PT (b), BUF_PT_BYTE (b));
2636 set_marker_restricted (w->start, 2636 set_marker_restricted (w->start,
2637 make_number (b->last_window_start), 2637 make_number (b->last_window_start),