(main): In the case of --unibyte, instead of aborting on finding

non-empty buffer, make it unibyte.

diff --git a/src/xterm.c b/src/xterm.c
index e4b1349863d8fdd32281b29423ec5393917c15dd..cc9942893d96cdd94bcb0adf7841ebe6864c489b 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12289,10 +12289,14 @@ x_new_fontset (f, fontsetname)
 
   if (fontset < 0)
     {
-      Lisp_Object fontlist;
+      Lisp_Object func;
 
-      fontlist = Fcons (Fcons (Qascii, Fcons (result, Qnil)), Qnil);
-      Fnew_fontset (result, fontlist);
+      func = intern ("create-fontset-from-ascii-font");
+      if (! NILP (Ffboundp (func)))
+       result = call2 (func, result, result);
+      else
+       Fnew_fontset (result,
+                     Fcons (Fcons (Qascii, Fcons (result, Qnil)), Qnil));
       fontset = fs_query_fontset (result, 0);
     }