# HG changeset patch # User Jason Rumney # Date 1195267211 0 # Node ID 988512d3a5528bfa6a7894f53fe6666fa7bb8cf6 # Parent 576e9fac9ec817a48206597583c1ec75e9ac855b (w32-initialize-window-system): Use t, not nil to signify default fontset. diff -r 576e9fac9ec8 -r 988512d3a552 lisp/term/w32-win.el --- a/lisp/term/w32-win.el Wed Nov 14 04:52:20 2007 +0000 +++ b/lisp/term/w32-win.el Sat Nov 17 02:40:11 2007 +0000 @@ -1082,12 +1082,6 @@ (error "Suspending an Emacs running under W32 makes no sense")) -;;; Enable Japanese fonts on Windows to be used by default. -;; (set-fontset-font nil (make-char 'katakana-jisx0201) '("*" . "JISX0208-SJIS")) -;; (set-fontset-font nil (make-char 'latin-jisx0201) '("*" . "JISX0208-SJIS")) -;; (set-fontset-font nil (make-char 'japanese-jisx0208) '("*" . "JISX0208-SJIS")) -;; (set-fontset-font nil (make-char 'japanese-jisx0208-1978) '("*" . "JISX0208-SJIS")) - (defun mouse-set-font (&rest fonts) "Select an Emacs font from a list of known good fonts and fontsets. @@ -1160,13 +1154,13 @@ (setup-default-fontset) ;; Enable Japanese fonts on Windows to be used by default. - (set-fontset-font nil (make-char 'katakana-jisx0201) + (set-fontset-font t (make-char 'katakana-jisx0201) '("*" . "JISX0208-SJIS")) - (set-fontset-font nil (make-char 'latin-jisx0201) + (set-fontset-font t (make-char 'latin-jisx0201) '("*" . "JISX0208-SJIS")) - (set-fontset-font nil (make-char 'japanese-jisx0208) + (set-fontset-font t (make-char 'japanese-jisx0208) '("*" . "JISX0208-SJIS")) - (set-fontset-font nil (make-char 'japanese-jisx0208-1978) + (set-fontset-font t (make-char 'japanese-jisx0208-1978) '("*" . "JISX0208-SJIS")) ;; Create the standard fontset.