diff options
| author | Richard M. Stallman | 1995-10-03 09:13:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-10-03 09:13:55 +0000 |
| commit | 1c78509be74ec16a9c04cb64e466af5028664cf9 (patch) | |
| tree | d1866fa9c509f9ca9778553bd7a90da06b712194 /src | |
| parent | 75c43375f45ab40548b2463299b73c8150dec3eb (diff) | |
| download | emacs-1c78509be74ec16a9c04cb64e466af5028664cf9.tar.gz emacs-1c78509be74ec16a9c04cb64e466af5028664cf9.zip | |
(get_display_line): Don't abort if there's text
in the line to the right beyond HPOS.
(quit_error_check): Make this a no-op.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 72e7c80f334..ae1798681ad 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -534,9 +534,6 @@ get_display_line (frame, vpos, hpos) | |||
| 534 | if (vpos < 0) | 534 | if (vpos < 0) |
| 535 | abort (); | 535 | abort (); |
| 536 | 536 | ||
| 537 | if ((desired_glyphs->enable[vpos]) && desired_glyphs->used[vpos] > hpos) | ||
| 538 | abort (); | ||
| 539 | |||
| 540 | if (! desired_glyphs->enable[vpos]) | 537 | if (! desired_glyphs->enable[vpos]) |
| 541 | { | 538 | { |
| 542 | desired_glyphs->used[vpos] = 0; | 539 | desired_glyphs->used[vpos] = 0; |
| @@ -1400,12 +1397,14 @@ update_frame (f, force, inhibit_hairy_id) | |||
| 1400 | void | 1397 | void |
| 1401 | quit_error_check () | 1398 | quit_error_check () |
| 1402 | { | 1399 | { |
| 1400 | #if 0 | ||
| 1403 | if (FRAME_DESIRED_GLYPHS (selected_frame) == 0) | 1401 | if (FRAME_DESIRED_GLYPHS (selected_frame) == 0) |
| 1404 | return; | 1402 | return; |
| 1405 | if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[0]) | 1403 | if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[0]) |
| 1406 | abort (); | 1404 | abort (); |
| 1407 | if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[FRAME_HEIGHT (selected_frame) - 1]) | 1405 | if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[FRAME_HEIGHT (selected_frame) - 1]) |
| 1408 | abort (); | 1406 | abort (); |
| 1407 | #endif | ||
| 1409 | } | 1408 | } |
| 1410 | 1409 | ||
| 1411 | /* Decide what insert/delete line to do, and do it */ | 1410 | /* Decide what insert/delete line to do, and do it */ |