From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 1 Sep 2022 05:56:30 +0000 (+0300)
Subject: ; * src/xdisp.c (lookup_glyphless_char_display): Fix last merge.
X-Git-Tag: emacs-29.0.90~1856^2~810
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67b85decc7702c24f2904e60e3eecfc2bfca5ab6;p=emacs.git

; * src/xdisp.c (lookup_glyphless_char_display): Fix last merge.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 2c9dc63a389..80a07636951 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7842,13 +7842,7 @@ lookup_glyphless_char_display (int c, struct it *it)
       && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (Vglyphless_char_display)) >= 1)
     {
       if (c >= 0)
-	{
-	  glyphless_method = CHAR_TABLE_REF (Vglyphless_char_display, c);
-	  if (CONSP (glyphless_method))
-	    glyphless_method = FRAME_WINDOW_P (it->f)
-	      ? XCAR (glyphless_method)
-	      : XCDR (glyphless_method);
-	}
+	glyphless_method = CHAR_TABLE_REF (Vglyphless_char_display, c);
       else
 	glyphless_method = XCHAR_TABLE (Vglyphless_char_display)->extras[0];