Mercurial > emacs

comparison src/window.c @ 83487:414faf8dce4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
83486:fc6efa09ea7a 83487:414faf8dce4e
214 Lisp_Object Vscroll_preserve_screen_position; 214 Lisp_Object Vscroll_preserve_screen_position;
215 215
216 /* Incremented by 1 whenever a window is deleted. */ 216 /* Incremented by 1 whenever a window is deleted. */
217 217
218 int window_deletion_count; 218 int window_deletion_count;
219
220 /* Used by the function window_scroll_pixel_based */
221
222 static int preserve_y;
219 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;
223 #endif /* 0 */ 227 #endif /* 0 */
4724 struct text_pos start; 4728 struct text_pos start;
4725 Lisp_Object tem; 4729 Lisp_Object tem;
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
4733 /* If PT is not visible in WINDOW, move back one half of 4736 /* If PT is not visible in WINDOW, move back one half of
4734 the screen. Allow PT to be partially visible, otherwise 4737 the screen. Allow PT to be partially visible, otherwise
7021 7024
7022 staticpro (&Vwindow_list); 7025 staticpro (&Vwindow_list);
7023 7026
7024 minibuf_selected_window = Qnil; 7027 minibuf_selected_window = Qnil;
7025 staticpro (&minibuf_selected_window); 7028 staticpro (&minibuf_selected_window);
7029
7030 preserve_y = -1;
7026 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.
7030 Used by `with-output-to-temp-buffer'. 7035 Used by `with-output-to-temp-buffer'.