(print-fontset): Combine family part

and registry part of the fontname by "-*-" instead of "-".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49124734b1f68aea5e348139e5a96e92a67836e8..9eca8065d8fbd95ce77e23ca35ff6a03543652f8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-26  Kenichi Handa  <handa@etl.go.jp>
 
+       * international/mule-diag.el (print-fontset): Combine family part
+       and registry part of the fontname by "-*-" instead of "-".
+
        * international/mule-cmds.el (encode-coding-char): Make strings
        multibyte before calling encode-coding-string.
 

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index bfe64a7ffda7402d232055ca83d73e3dd17faeb5..39f50e1b4876f3639eba0231f0dc8d59a4beace3 100644 (file)
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1079,8 +1079,8 @@ but still contains full information about each coding system."
          (insert font-spec)
        (if (car font-spec)
            (if (string-match "-" (car font-spec))
-               (insert "-" (car font-spec) "-")
-             (insert "-*-" (car font-spec) "-"))
+               (insert "-" (car font-spec) "-*-")
+             (insert "-*-" (car font-spec) "-*-"))
          (insert "-*-"))
        (if (cdr font-spec)
            (if (string-match "-" (cdr font-spec))

diff --git a/src/ChangeLog b/src/ChangeLog
index 59b7966bdfbd7b31ceb73c31236ef0c56da48c41..4f2fa2f47c32af99619fccb4cb7e7cf3d6c242e0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-26  Kenichi Handa  <handa@etl.go.jp>
 
+       * fontset.c (syms_of_fontset): Adjust the font name for ascii of
+       the default fontset to what Emacs uses by default.
+
        * charset.c (init_charset_once): Set the table bytes_by_char_head
        correctly.