comparison src/redisplay.c @ 267:966663fcf606 r20-5b32

Import from CVS: tag r20-5b32
author cvs
date Mon, 13 Aug 2007 10:26:29 +0200
parents 8efd647ea9ca
children b2472a1930f2
comparison
equal deleted inserted replaced
266:18d185df8c54 267:966663fcf606
6257 Qpost_redisplay_hook); 6257 Qpost_redisplay_hook);
6258 #endif /* INHIBIT_REDISPLAY_HOOKS */ 6258 #endif /* INHIBIT_REDISPLAY_HOOKS */
6259 } 6259 }
6260 6260
6261 6261
6262 static char window_line_number_buf[16]; 6262 static char window_line_number_buf[32];
6263 6263
6264 /* Efficiently determine the window line number, and return a pointer 6264 /* Efficiently determine the window line number, and return a pointer
6265 to its printed representation. Do this regardless of whether 6265 to its printed representation. Do this regardless of whether
6266 line-number-mode is on. The first line in the buffer is counted as 6266 line-number-mode is on. The first line in the buffer is counted as
6267 1. If narrowing is in effect, the lines are counted from the 6267 1. If narrowing is in effect, the lines are counted from the
7087 7087
7088 /* If point or start are not in the accessible buffer range, then 7088 /* If point or start are not in the accessible buffer range, then
7089 fail. */ 7089 fail. */
7090 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b) 7090 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
7091 || point < BUF_BEGV (b) || point > BUF_ZV (b)) 7091 || point < BUF_BEGV (b) || point > BUF_ZV (b))
7092 { 7092 return 0;
7093 w->line_cache_validation_override--;
7094 return 0;
7095 }
7096 7093
7097 validate_line_start_cache (w); 7094 validate_line_start_cache (w);
7098 w->line_cache_validation_override++; 7095 w->line_cache_validation_override++;
7099 7096
7100 start_elt = point_in_line_start_cache (w, startp, 0); 7097 start_elt = point_in_line_start_cache (w, startp, 0);
7276 w->line_cache_validation_override++; 7273 w->line_cache_validation_override++;
7277 7274
7278 cur_elt = point_in_line_start_cache (w, point, 0); 7275 cur_elt = point_in_line_start_cache (w, point, 0);
7279 /* #### See comment in update_line_start_cache about big minibuffers. */ 7276 /* #### See comment in update_line_start_cache about big minibuffers. */
7280 if (cur_elt < 0) 7277 if (cur_elt < 0)
7281 return point; 7278 {
7279 w->line_cache_validation_override--;
7280 return point;
7281 }
7282 7282
7283 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height; 7283 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
7284 7284
7285 while (1) 7285 while (1)
7286 { 7286 {