aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2007-11-17 02:40:11 +0000
committerJason Rumney2007-11-17 02:40:11 +0000
commit70628e53b59178ae0aa1a3472f417af196d39e79 (patch)
treece9df8e1a0ef21a5323facfb0412cd3a35ead514
parentd4599abc0406fa8362bae4fa39c79bb896535abe (diff)
downloademacs-70628e53b59178ae0aa1a3472f417af196d39e79.tar.gz
emacs-70628e53b59178ae0aa1a3472f417af196d39e79.zip
(w32-initialize-window-system): Use t, not nil to signify default fontset.
-rw-r--r--lisp/term/w32-win.el14
1 files 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.")
1082 (error "Suspending an Emacs running under W32 makes no sense")) 1082 (error "Suspending an Emacs running under W32 makes no sense"))
1083 1083
1084 1084
1085;;; Enable Japanese fonts on Windows to be used by default.
1086;; (set-fontset-font nil (make-char 'katakana-jisx0201) '("*" . "JISX0208-SJIS"))
1087;; (set-fontset-font nil (make-char 'latin-jisx0201) '("*" . "JISX0208-SJIS"))
1088;; (set-fontset-font nil (make-char 'japanese-jisx0208) '("*" . "JISX0208-SJIS"))
1089;; (set-fontset-font nil (make-char 'japanese-jisx0208-1978) '("*" . "JISX0208-SJIS"))
1090
1091(defun mouse-set-font (&rest fonts) 1085(defun mouse-set-font (&rest fonts)
1092 "Select an Emacs font from a list of known good fonts and fontsets. 1086 "Select an Emacs font from a list of known good fonts and fontsets.
1093 1087
@@ -1160,13 +1154,13 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
1160 (setup-default-fontset) 1154 (setup-default-fontset)
1161 1155
1162 ;; Enable Japanese fonts on Windows to be used by default. 1156 ;; Enable Japanese fonts on Windows to be used by default.
1163 (set-fontset-font nil (make-char 'katakana-jisx0201) 1157 (set-fontset-font t (make-char 'katakana-jisx0201)
1164 '("*" . "JISX0208-SJIS")) 1158 '("*" . "JISX0208-SJIS"))
1165 (set-fontset-font nil (make-char 'latin-jisx0201) 1159 (set-fontset-font t (make-char 'latin-jisx0201)
1166 '("*" . "JISX0208-SJIS")) 1160 '("*" . "JISX0208-SJIS"))
1167 (set-fontset-font nil (make-char 'japanese-jisx0208) 1161 (set-fontset-font t (make-char 'japanese-jisx0208)
1168 '("*" . "JISX0208-SJIS")) 1162 '("*" . "JISX0208-SJIS"))
1169 (set-fontset-font nil (make-char 'japanese-jisx0208-1978) 1163 (set-fontset-font t (make-char 'japanese-jisx0208-1978)
1170 '("*" . "JISX0208-SJIS")) 1164 '("*" . "JISX0208-SJIS"))
1171 1165
1172 ;; Create the standard fontset. 1166 ;; Create the standard fontset.