Mercurial > emacs
diff src/window.c @ 83487:414faf8dce4e
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-136
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-137
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-138
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-139
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-140
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-141
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-142
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-143
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/gnus--rel--5.10--patch-49
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-50
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-51
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-52
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-53
Update from CVS: Makefile.in (release-*): New targets.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-54
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-55
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-527
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Fri, 10 Mar 2006 11:23:32 +0000 |
| parents | a380ca43a190 12e65aa88734 |
| children | 0cdee8b991e1 |
line wrap: on
line diff
--- a/src/window.c Wed Mar 08 16:47:48 2006 +0000 +++ b/src/window.c Fri Mar 10 11:23:32 2006 +0000 @@ -217,6 +217,10 @@ int window_deletion_count; +/* Used by the function window_scroll_pixel_based */ + +static int preserve_y; + #if 0 /* This isn't used anywhere. */ /* Nonzero means we can split a frame even if it is "unsplittable". */ static int inhibit_frame_unsplittable; @@ -4726,7 +4730,6 @@ int this_scroll_margin; /* True if we fiddled the window vscroll field without really scrolling. */ int vscrolled = 0; - static int preserve_y = -1; SET_TEXT_POS_FROM_MARKER (start, w->start); @@ -7024,6 +7027,8 @@ minibuf_selected_window = Qnil; staticpro (&minibuf_selected_window); + preserve_y = -1; + DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, doc: /* Non-nil means call as function to display a help buffer. The function is called with one argument, the buffer to be displayed.