diff options
| author | Richard M. Stallman | 1994-05-30 12:55:41 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-05-30 12:55:41 +0000 |
| commit | bd48a05275fa230baab8c434132b0be5807ca9cb (patch) | |
| tree | fdd053c2cdc2150c2b0bdb4bb3e0aabcea9b9077 /src | |
| parent | 3c8c72e0457c1a67c5aafa9ca9bc7f15f8b24086 (diff) | |
| download | emacs-bd48a05275fa230baab8c434132b0be5807ca9cb.tar.gz emacs-bd48a05275fa230baab8c434132b0be5807ca9cb.zip | |
(command_loop_1): Allow direct output for insert
if have display table but it says nothing for this char code.
Don't allow it if char code has a glyph with a face code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 3619dc0abf6..844e17467d1 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1162,12 +1162,15 @@ 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 (XTYPE (obj) == Lisp_Vector | 1165 | if (NILP (obj) |
| 1166 | && XVECTOR (obj)->size == 1 | 1166 | || (XTYPE (obj) == Lisp_Vector |
| 1167 | && (XTYPE (obj = XVECTOR (obj)->contents[0]) | 1167 | && XVECTOR (obj)->size == 1 |
| 1168 | == Lisp_Int)) | 1168 | && (XTYPE (obj = XVECTOR (obj)->contents[0]) |
| 1169 | no_redisplay = | 1169 | == Lisp_Int) |
| 1170 | direct_output_for_insert (XINT (obj)); | 1170 | /* Insist face not specified in glyph. */ |
| 1171 | && (XINT (obj) & ((-1) << 8)) == 0)) | ||
| 1172 | no_redisplay | ||
| 1173 | = direct_output_for_insert (XINT (obj)); | ||
| 1171 | } | 1174 | } |
| 1172 | else | 1175 | else |
| 1173 | { | 1176 | { |