comparison src/window.c @ 347:7c94d56991e1 r21-1-3

Import from CVS: tag r21-1-3
author cvs
date Mon, 13 Aug 2007 10:53:48 +0200
parents 8bec6624d99b
children 182f72e8cd0d
comparison
equal deleted inserted replaced
346:dd0986ffd2cf 347:7c94d56991e1
1339 line_start_cache_dynarr *cache; 1339 line_start_cache_dynarr *cache;
1340 1340
1341 if (NILP (window)) 1341 if (NILP (window))
1342 window = Fselected_window (Qnil); 1342 window = Fselected_window (Qnil);
1343 1343
1344 CHECK_WINDOW (window); 1344 CHECK_LIVE_WINDOW (window);
1345 w = XWINDOW (window); 1345 w = XWINDOW (window);
1346 1346
1347 start = marker_position (w->start[CURRENT_DISP]); 1347 start = marker_position (w->start[CURRENT_DISP]);
1348 hlimit = WINDOW_TEXT_HEIGHT (w); 1348 hlimit = WINDOW_TEXT_HEIGHT (w);
1349 eobuf = BUF_ZV (XBUFFER (w->buffer)); 1349 eobuf = BUF_ZV (XBUFFER (w->buffer));
3360 int psize; 3360 int psize;
3361 3361
3362 if (NILP (window)) 3362 if (NILP (window))
3363 window = Fselected_window (Qnil); 3363 window = Fselected_window (Qnil);
3364 else 3364 else
3365 CHECK_WINDOW (window); 3365 CHECK_LIVE_WINDOW (window);
3366 3366
3367 o = XWINDOW (window); 3367 o = XWINDOW (window);
3368 f = XFRAME (WINDOW_FRAME (o)); 3368 f = XFRAME (WINDOW_FRAME (o));
3369 3369
3370 if (NILP (chsize)) 3370 if (NILP (chsize))
4302 /* Don't use decode_window() because we need the new value of 4302 /* Don't use decode_window() because we need the new value of
4303 WINDOW. */ 4303 WINDOW. */
4304 if (NILP (window)) 4304 if (NILP (window))
4305 window = Fselected_window (Qnil); 4305 window = Fselected_window (Qnil);
4306 else 4306 else
4307 CHECK_WINDOW (window); 4307 CHECK_LIVE_WINDOW (window);
4308 w = XWINDOW (window); 4308 w = XWINDOW (window);
4309 b = XBUFFER (w->buffer); 4309 b = XBUFFER (w->buffer);
4310 4310
4311 height = window_displayed_height (w); 4311 height = window_displayed_height (w);
4312 selected = EQ (window, Fselected_window (w->frame)); 4312 selected = EQ (window, Fselected_window (w->frame));