changeset 7758:ce538d63b1e9

(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.
author Richard M. Stallman <rms@gnu.org>
date Mon, 30 May 1994 12:55:41 +0000
parents 8d27747de7ca
children 814aaac0b155
files src/keyboard.c
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Mon May 30 12:36:21 1994 +0000
+++ b/src/keyboard.c	Mon May 30 12:55:41 1994 +0000
@@ -1162,12 +1162,15 @@
 			  Lisp_Object obj;
 
 			  obj = DISP_CHAR_VECTOR (dp, lose);
-			  if (XTYPE (obj) == Lisp_Vector
-			      && XVECTOR (obj)->size == 1
-			      && (XTYPE (obj = XVECTOR (obj)->contents[0])
-				  == Lisp_Int))
-			    no_redisplay =
-			      direct_output_for_insert (XINT (obj));
+			  if (NILP (obj)
+			      || (XTYPE (obj) == Lisp_Vector
+				  && XVECTOR (obj)->size == 1
+				  && (XTYPE (obj = XVECTOR (obj)->contents[0])
+				      == Lisp_Int)
+				  /* Insist face not specified in glyph.  */
+				  && (XINT (obj) & ((-1) << 8)) == 0))
+			    no_redisplay
+			      = direct_output_for_insert (XINT (obj));
 			}
 		      else
 			{