# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 963661776 0
# Node ID c6e051bf5f2e9248ea682629f1e9a74ff49d27d3
# Parent  5a0d447b7eea7b9adc3d3664d431b4af2282d723
Make FONTNAME arg to set-fontset-font a cons.

diff -r 5a0d447b7eea -r c6e051bf5f2e lisp/term/w32-win.el
--- a/lisp/term/w32-win.el	Fri Jul 14 20:29:04 2000 +0000
+++ b/lisp/term/w32-win.el	Sat Jul 15 11:49:36 2000 +0000
@@ -851,10 +851,10 @@
 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.