(separate_textual_runs): Use

`default-coded-charset-priority-list-for-font' if it is not nil.

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index cf1766e..c174e8a 100644 (file)
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -151,7 +151,19 @@ separate_textual_runs (unsigned char *text_storage,
       int dimension;
       int graphic;
 
-      BREAKUP_CHAR (ch, charset, byte1, byte2);
+      if (EQ (Vdefault_coded_charset_priority_list_for_font, Qnil))
+       BREAKUP_CHAR (ch, charset, byte1, byte2);
+      else
+       {
+         Lisp_Object original_default_coded_charset_priority_list
+           = Vdefault_coded_charset_priority_list;
+
+         Vdefault_coded_charset_priority_list
+           = Vdefault_coded_charset_priority_list_for_font;
+         BREAKUP_CHAR (ch, charset, byte1, byte2);
+         Vdefault_coded_charset_priority_list
+           = original_default_coded_charset_priority_list;
+       }
       dimension = XCHARSET_DIMENSION (charset);
       graphic   = XCHARSET_GRAPHIC   (charset);