diff options
| author | Richard M. Stallman | 1994-06-05 11:30:29 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-06-05 11:30:29 +0000 |
| commit | 054c8675bfdf965881ff4470360221cc6e9713eb (patch) | |
| tree | 848c788896a9ce097964793caf70df8428c1aacd /src | |
| parent | e8d9f2dff03e7bf7ad88496742dded3f0635f279 (diff) | |
| download | emacs-054c8675bfdf965881ff4470360221cc6e9713eb.tar.gz emacs-054c8675bfdf965881ff4470360221cc6e9713eb.zip | |
(command_loop_1): Properly handle nil in display table.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 844e17467d1..d7f6851874b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1162,13 +1162,14 @@ command_loop_1 () | |||
| 1162 | Lisp_Object obj; | 1162 | Lisp_Object obj; |
| 1163 | 1163 | ||
| 1164 | obj = DISP_CHAR_VECTOR (dp, lose); | 1164 | obj = DISP_CHAR_VECTOR (dp, lose); |
| 1165 | if (NILP (obj) | 1165 | if (NILP (obj)) |
| 1166 | || (XTYPE (obj) == Lisp_Vector | 1166 | no_redisplay = direct_output_for_insert (lose); |
| 1167 | && XVECTOR (obj)->size == 1 | 1167 | else if (XTYPE (obj) == Lisp_Vector |
| 1168 | && (XTYPE (obj = XVECTOR (obj)->contents[0]) | 1168 | && XVECTOR (obj)->size == 1 |
| 1169 | == Lisp_Int) | 1169 | && (XTYPE (obj = XVECTOR (obj)->contents[0]) |
| 1170 | /* Insist face not specified in glyph. */ | 1170 | == Lisp_Int) |
| 1171 | && (XINT (obj) & ((-1) << 8)) == 0)) | 1171 | /* Insist face not specified in glyph. */ |
| 1172 | && (XINT (obj) & ((-1) << 8)) == 0) | ||
| 1172 | no_redisplay | 1173 | no_redisplay |
| 1173 | = direct_output_for_insert (XINT (obj)); | 1174 | = direct_output_for_insert (XINT (obj)); |
| 1174 | } | 1175 | } |