From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 15 Jul 2000 11:49:36 +0000 (+0000)
Subject: Make FONTNAME arg to set-fontset-font a cons.
X-Git-Tag: emacs-pretest-21.0.90~2811
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8322784013f25cd5a26a8ac8dbf3a4c0d8f5b4b6;p=emacs.git

Make FONTNAME arg to set-fontset-font a cons.
---

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 081c8d1ff85..ae675e388a0 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -851,10 +851,10 @@ will have like Terminal and Courier. These fonts are used in the font
 menu if the variable `w32-use-w32-font-dialog' is nil.")
 
 ;;; Enable Japanese fonts on Windows to be used by default.
-(set-fontset-font t (make-char 'katakana-jisx0201) "JISX0208-SJIS")
-(set-fontset-font t (make-char 'latin-jisx0201) "JISX0208-SJIS")
-(set-fontset-font t (make-char 'japanese-jisx0208) "JISX0208-SJIS")
-(set-fontset-font t (make-char 'japanese-jisx0208-1978) "JISX0208-SJIS")
+(set-fontset-font t (make-char 'katakana-jisx0201) '("*" . "JISX0208-SJIS"))
+(set-fontset-font t (make-char 'latin-jisx0201) '("*" . "JISX0208-SJIS"))
+(set-fontset-font t (make-char 'japanese-jisx0208) '("*" . "JISX0208-SJIS"))
+(set-fontset-font t (make-char 'japanese-jisx0208-1978) '("*" . "JISX0208-SJIS"))
 
 (defun mouse-set-font (&rest fonts)
   "Select a font.