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

[Eli Zaretskii]

branch: master
commit 67b85decc7702c24f2904e60e3eecfc2bfca5ab6
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; * src/xdisp.c (lookup_glyphless_char_display): Fix last merge.
---
 src/xdisp.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 2c9dc63a38..80a0763695 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];