aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2000-05-26 05:10:46 +0000
committerKenichi Handa2000-05-26 05:10:46 +0000
commitcebefb44f696b9c5172a5b2231432653a7b2ff9c (patch)
tree154a57587c572fb03b730ebafb5cfc0ccac9c8f3
parentbd9531732967151a847562e98a99fa6e97250ce6 (diff)
downloademacs-cebefb44f696b9c5172a5b2231432653a7b2ff9c.tar.gz
emacs-cebefb44f696b9c5172a5b2231432653a7b2ff9c.zip
(print-fontset): Combine family part
and registry part of the fontname by "-*-" instead of "-".
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/international/mule-diag.el4
-rw-r--r--src/ChangeLog3
3 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49124734b1f..9eca8065d8f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12000-05-26 Kenichi Handa <handa@etl.go.jp> 12000-05-26 Kenichi Handa <handa@etl.go.jp>
2 2
3 * international/mule-diag.el (print-fontset): Combine family part
4 and registry part of the fontname by "-*-" instead of "-".
5
3 * international/mule-cmds.el (encode-coding-char): Make strings 6 * international/mule-cmds.el (encode-coding-char): Make strings
4 multibyte before calling encode-coding-string. 7 multibyte before calling encode-coding-string.
5 8
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index bfe64a7ffda..39f50e1b487 100644
--- 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."
1079 (insert font-spec) 1079 (insert font-spec)
1080 (if (car font-spec) 1080 (if (car font-spec)
1081 (if (string-match "-" (car font-spec)) 1081 (if (string-match "-" (car font-spec))
1082 (insert "-" (car font-spec) "-") 1082 (insert "-" (car font-spec) "-*-")
1083 (insert "-*-" (car font-spec) "-")) 1083 (insert "-*-" (car font-spec) "-*-"))
1084 (insert "-*-")) 1084 (insert "-*-"))
1085 (if (cdr font-spec) 1085 (if (cdr font-spec)
1086 (if (string-match "-" (cdr font-spec)) 1086 (if (string-match "-" (cdr font-spec))
diff --git a/src/ChangeLog b/src/ChangeLog
index 59b7966bdfb..4f2fa2f47c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12000-05-26 Kenichi Handa <handa@etl.go.jp> 12000-05-26 Kenichi Handa <handa@etl.go.jp>
2 2
3 * fontset.c (syms_of_fontset): Adjust the font name for ascii of
4 the default fontset to what Emacs uses by default.
5
3 * charset.c (init_charset_once): Set the table bytes_by_char_head 6 * charset.c (init_charset_once): Set the table bytes_by_char_head
4 correctly. 7 correctly.
5 8