comparison src/window.c @ 83552:d3099204c799

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-585 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-586 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-587 Update from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-588 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-589 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-590 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-591 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-592
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 06 Jan 2007 15:25:16 +0000
parents 17e0dd217877 1026dad5d8c9
children b8d9a391daf3
comparison
equal deleted inserted replaced
83551:d9dc7e67ad3f 83552:d3099204c799
1182 return Qnil; 1182 return Qnil;
1183 #endif 1183 #endif
1184 1184
1185 if (! NILP (update) 1185 if (! NILP (update)
1186 && ! (! NILP (w->window_end_valid) 1186 && ! (! NILP (w->window_end_valid)
1187 && XFASTINT (w->last_modified) >= BUF_MODIFF (b)) 1187 && XFASTINT (w->last_modified) >= BUF_MODIFF (b)
1188 && XFASTINT (w->last_overlay_modified) >= BUF_OVERLAY_MODIFF (b))
1188 && !noninteractive) 1189 && !noninteractive)
1189 { 1190 {
1190 struct text_pos startp; 1191 struct text_pos startp;
1191 struct it it; 1192 struct it it;
1192 struct buffer *old_buffer = NULL; 1193 struct buffer *old_buffer = NULL;