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

diff --git a/src/xdisp.c b/src/xdisp.c
index 2c9dc63a38906b3b0a68bc92b3af2b59cf6a7e56..80a07636951161155ada2fb352acc9499ff0a991 100644 (file)
--- 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];