From 70628e53b59178ae0aa1a3472f417af196d39e79 Mon Sep 17 00:00:00 2001
From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 17 Nov 2007 02:40:11 +0000
Subject: [PATCH] (w32-initialize-window-system): Use t, not nil to signify
default fontset.
---
lisp/term/w32-win.el | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index cba8ba0cbb7..688dd7deea8 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1082,12 +1082,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
(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 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
(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.
--
2.39.5