Mercurial > hg > xemacs-beta
diff src/redisplay.c @ 5049:548f1f47eb82
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Feb 2010 23:38:04 -0600 |
parents | 07dcc7000bbf 9410323e4b0d |
children | 0ca81354c4c7 8b2f75cecb89 |
line wrap: on
line diff
--- a/src/redisplay.c Sat Feb 20 23:34:25 2010 -0600 +++ b/src/redisplay.c Sat Feb 20 23:38:04 2010 -0600 @@ -728,7 +728,7 @@ struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt); /* "add" the block to the list */ - Dynarr_increment (dl->display_blocks); + Dynarr_incrementr (dl->display_blocks); /* initialize and return */ dbp->type = type; @@ -1221,7 +1221,7 @@ if (local) Dynarr_add (data->db->runes, *crb); else - Dynarr_increment (data->db->runes); + Dynarr_incrementr (data->db->runes); data->pixpos += width; @@ -4532,7 +4532,7 @@ if (Dynarr_length (dla) == 0) { if (Dynarr_largest (dla) > 0) - Dynarr_increment (dla); + Dynarr_incrementr (dla); else { struct display_line modeline; @@ -5301,9 +5301,10 @@ /* -Info on Re-entrancy crashes, with backtraces given: - - (Info-goto-node "(internals)Nasty Bugs due to Reentrancy in Redisplay Structures handling QUIT") +Info on reentrancy crashes, with backtraces given: + + (Info-goto-node "(internals)Critical Redisplay Sections") + */ @@ -5405,7 +5406,7 @@ if (pos_of_dlp < 0) Dynarr_add (dla, *dlp); else if (pos_of_dlp == Dynarr_length (dla)) - Dynarr_increment (dla); + Dynarr_incrementr (dla); else ABORT (); @@ -5459,13 +5460,13 @@ if (!in_display) depth = enter_redisplay_critical_section (); - /* This is one spot where a re-entrancy crash will occur, due to a check + /* This is one spot where a reentrancy crash will occur, due to a check in the dynarr to make sure it isn't "locked" */ /* -Info on Re-entrancy crashes, with backtraces given: - - (Info-goto-node "(internals)Nasty Bugs due to Reentrancy in Redisplay Structures handling QUIT") +Info on reentrancy crashes, with backtraces given: + + (Info-goto-node "(internals)Critical Redisplay Sections") */ Dynarr_reset (dla); @@ -5628,7 +5629,7 @@ if (pos_of_dlp < 0) Dynarr_add (dla, *dlp); else if (pos_of_dlp == Dynarr_length (dla)) - Dynarr_increment (dla); + Dynarr_incrementr (dla); else ABORT (); @@ -8469,7 +8470,7 @@ return; } - Dynarr_insert_many_at_start (cache, Dynarr_begin (internal_cache), + Dynarr_prepend_many (cache, Dynarr_begin (internal_cache), ic_elt + 1); }