Mercurial > emacs

comparison src/xdisp.c @ 83565:41aaac7180d5

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-708 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-709 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-710 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-711 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-712 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-713 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-714 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-715 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-716 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-717 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-718 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-719 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-720 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-721 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-722 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-723 Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change. * emacs@sv.gnu.org/emacs--devo--0--patch-724 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-725 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-726 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-727 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-728 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-729 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-730 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-731 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-732 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-733 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-734 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-735 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-736 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-737 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-738 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-739 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--devo--0--patch-740 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-741 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-742 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-743 Merge from emacs--rel--22 * emacs@sv.gnu.org/emacs--rel--22--base-0 tag of emacs@sv.gnu.org/emacs--devo--0--patch-709 * emacs@sv.gnu.org/emacs--rel--22--patch-1 Sync to CVS tag EMACS_22_BRANCHPOINT * emacs@sv.gnu.org/emacs--rel--22--patch-2 Sync to CVS branch EMACS_22_BASE * emacs@sv.gnu.org/emacs--rel--22--patch-3 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-4 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-5 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-6 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-7 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-8 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-9 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-10 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-11 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-12 Update from CVS * emacs@sv.gnu.org/emacs--rel--22--patch-13 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-217 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-218 Merge from emacs--devo--0, emacs--rel--22 * emacs@sv.gnu.org/gnus--rel--5.10--patch-219 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-220 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-605
author Karoly Lorentey <karoly@lorentey.hu>
date Fri, 11 May 2007 18:24:42 +0000
parents dc002877ce12 a76ca64a56e8
children 8244ea66b7a6
comparison
equal deleted inserted replaced
83564:8cb34e1b7bbb 83565:41aaac7180d5
12784 int temp_scroll_step = 0; 12784 int temp_scroll_step = 0;
12785 int count = SPECPDL_INDEX (); 12785 int count = SPECPDL_INDEX ();
12786 int rc; 12786 int rc;
12787 int centering_position = -1; 12787 int centering_position = -1;
12788 int last_line_misfit = 0; 12788 int last_line_misfit = 0;
12789 int save_beg_unchanged = BEG_UNCHANGED; 12789 int save_beg_unchanged, save_end_unchanged;
12790 int save_end_unchanged = END_UNCHANGED;
12791 12790
12792 SET_TEXT_POS (lpoint, PT, PT_BYTE); 12791 SET_TEXT_POS (lpoint, PT, PT_BYTE);
12793 opoint = lpoint; 12792 opoint = lpoint;
12794 12793
12795 /* W must be a leaf window here. */ 12794 /* W must be a leaf window here. */
12849 value. */ 12848 value. */
12850 /* Really select the buffer, for the sake of buffer-local 12849 /* Really select the buffer, for the sake of buffer-local
12851 variables. */ 12850 variables. */
12852 set_buffer_internal_1 (XBUFFER (w->buffer)); 12851 set_buffer_internal_1 (XBUFFER (w->buffer));
12853 SET_TEXT_POS (opoint, PT, PT_BYTE); 12852 SET_TEXT_POS (opoint, PT, PT_BYTE);
12853
12854 save_beg_unchanged = BEG_UNCHANGED;
12855 save_end_unchanged = END_UNCHANGED;
12854 12856
12855 current_matrix_up_to_date_p 12857 current_matrix_up_to_date_p
12856 = (!NILP (w->window_end_valid) 12858 = (!NILP (w->window_end_valid)
12857 && !current_buffer->clip_changed 12859 && !current_buffer->clip_changed
12858 && !current_buffer->prevent_redisplay_optimizations_p 12860 && !current_buffer->prevent_redisplay_optimizations_p
13819 start_vpos, 13821 start_vpos,
13820 MATRIX_ROW_VPOS (bottom_row, w->current_matrix), 13822 MATRIX_ROW_VPOS (bottom_row, w->current_matrix),
13821 nrows_scrolled); 13823 nrows_scrolled);
13822 13824
13823 /* Disable lines that must be updated. */ 13825 /* Disable lines that must be updated. */
13824 for (i = 0; i < it.vpos; ++i) 13826 for (i = 0; i < nrows_scrolled; ++i)
13825 (start_row + i)->enabled_p = 0; 13827 (start_row + i)->enabled_p = 0;
13826 13828
13827 /* Re-compute Y positions. */ 13829 /* Re-compute Y positions. */
13828 min_y = WINDOW_HEADER_LINE_HEIGHT (w); 13830 min_y = WINDOW_HEADER_LINE_HEIGHT (w);
13829 max_y = it.last_visible_y; 13831 max_y = it.last_visible_y;