diff options
| author | Richard M. Stallman | 2002-07-22 16:15:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-07-22 16:15:53 +0000 |
| commit | 72b8c43455d5603ad8270b8a320e85e3472ed82f (patch) | |
| tree | 38d3a05c78768e9db0d3ee62ec0c0ef5982adb43 /src | |
| parent | fd4a98f021a928c4a34c13755073e8c5df911563 (diff) | |
| download | emacs-72b8c43455d5603ad8270b8a320e85e3472ed82f.tar.gz emacs-72b8c43455d5603ad8270b8a320e85e3472ed82f.zip | |
(display_line): Replace an unconditional abort with an assertion.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dd4dc158938..c375831f1ea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2002-07-22 Gerd Moellmann <gerd.moellmann@t-online.de> | ||
| 2 | |||
| 3 | * xdisp.c (display_line): Replace an abort with xassert. | ||
| 4 | |||
| 1 | 2002-07-21 Richard M. Stallman <rms@gnu.org> | 5 | 2002-07-21 Richard M. Stallman <rms@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (redisplay_window): Don't test BEG_UNCHANGED | 7 | * xdisp.c (redisplay_window): Don't test BEG_UNCHANGED |
diff --git a/src/xdisp.c b/src/xdisp.c index 4e52d39c908..cf538ed9241 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -13229,9 +13229,10 @@ display_line (it) | |||
| 13229 | { | 13229 | { |
| 13230 | /* Glyph is completely off the left margin of the | 13230 | /* Glyph is completely off the left margin of the |
| 13231 | window. This should not happen because of the | 13231 | window. This should not happen because of the |
| 13232 | move_it_in_display_line at the start of | 13232 | move_it_in_display_line at the start of this |
| 13233 | this function. */ | 13233 | function, unless the text display area of the |
| 13234 | abort (); | 13234 | window is empty. */ |
| 13235 | xassert (it->first_visible_x <= it->last_visible_x); | ||
| 13235 | } | 13236 | } |
| 13236 | } | 13237 | } |
| 13237 | 13238 | ||