From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 17 Apr 2017 05:50:02 +0000 (-0700)
Subject: Work around bug with unibyte Linux consoles
X-Git-Tag: emacs-26.0.90~521^2~616
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1cad61030160ebc4b73e1f4212155a180d417be3;p=emacs.git

Work around bug with unibyte Linux consoles

* src/terminal.c (terminal_glyph_code): Skip the UTF-8 stuff if
the terminal's coding system is unibyte (Bug#26396).
---

diff --git a/src/terminal.c b/src/terminal.c
index 0b1cbe7b791..3d25b36fa56 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -575,7 +575,9 @@ Lisp_Object
 terminal_glyph_code (struct terminal *t, int ch)
 {
 #if HAVE_STRUCT_UNIPAIR_UNICODE
-  if (t->type == output_termcap)
+  /* Heuristically assume that a terminal supporting glyph codes is in
+     UTF-8 mode if and only if its coding system is multibyte (Bug#26396).  */
+  if (t->type == output_termcap && t->terminal_coding->src_multibyte)
     {
       /* As a hack, recompute the table when CH is the maximum
 	 character.  */