comparison src/window.c @ 414:da8ed4261e83 r21-2-15

Import from CVS: tag r21-2-15
author cvs
date Mon, 13 Aug 2007 11:21:38 +0200
parents 697ef44129c6
children 41dbb7a9d5f2
comparison
equal deleted inserted replaced
413:901169e5ca31 414:da8ed4261e83
1343 line_start_cache_dynarr *cache; 1343 line_start_cache_dynarr *cache;
1344 1344
1345 if (NILP (window)) 1345 if (NILP (window))
1346 window = Fselected_window (Qnil); 1346 window = Fselected_window (Qnil);
1347 1347
1348 CHECK_WINDOW (window); 1348 CHECK_LIVE_WINDOW (window);
1349 w = XWINDOW (window); 1349 w = XWINDOW (window);
1350 1350
1351 start = marker_position (w->start[CURRENT_DISP]); 1351 start = marker_position (w->start[CURRENT_DISP]);
1352 hlimit = WINDOW_TEXT_HEIGHT (w); 1352 hlimit = WINDOW_TEXT_HEIGHT (w);
1353 eobuf = BUF_ZV (XBUFFER (w->buffer)); 1353 eobuf = BUF_ZV (XBUFFER (w->buffer));
3364 int psize; 3364 int psize;
3365 3365
3366 if (NILP (window)) 3366 if (NILP (window))
3367 window = Fselected_window (Qnil); 3367 window = Fselected_window (Qnil);
3368 else 3368 else
3369 CHECK_WINDOW (window); 3369 CHECK_LIVE_WINDOW (window);
3370 3370
3371 o = XWINDOW (window); 3371 o = XWINDOW (window);
3372 f = XFRAME (WINDOW_FRAME (o)); 3372 f = XFRAME (WINDOW_FRAME (o));
3373 3373
3374 if (NILP (chsize)) 3374 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));