From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 30 May 1994 12:55:41 +0000 (+0000)
Subject: (command_loop_1): Allow direct output for insert
X-Git-Tag: emacs-19.34~8095
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd48a05275fa230baab8c434132b0be5807ca9cb;p=emacs.git

(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.
---

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 ()
 			  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
 			{