[Emacs-diffs] Changes to emacs/lisp/term/w32-win.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/02/01 16:01:31

Index: lisp/term/w32-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/w32-win.el,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- lisp/term/w32-win.el        31 Jan 2008 11:35:46 -0000      1.94
+++ lisp/term/w32-win.el        1 Feb 2008 16:01:25 -0000       1.95
@@ -78,7 +78,6 @@
 (require 'select)
 (require 'menu-bar)
 (require 'dnd)
-(require 'code-pages)
 (require 'w32-vars)
 
 ;; Keep an obsolete alias for w32-focus-frame in case it is used by code
@@ -1148,43 +1147,19 @@
   (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.
   (create-fontset-from-fontset-spec w32-standard-fontset-spec t)
   ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1,...).
   (create-fontset-from-x-resource)
-  ;; Try to create a fontset from a font specification which comes
-  ;; from initial-frame-alist, default-frame-alist, or X resource.
-  ;; A font specification in command line argument (i.e. -fn XXXX)
-  ;; should be already in default-frame-alist as a `font'
-  ;; parameter.  However, any font specifications in site-start
-  ;; library, user's init file (.emacs), and default.el are not
-  ;; yet handled here.
-
-  (let ((font (or (cdr (assq 'font initial-frame-alist))
-                  (cdr (assq 'font default-frame-alist))
-                  (x-get-resource "font" "Font")))
-        xlfd-fields resolved-name)
-    (if (and font
-             (not (query-fontset font))
-             (setq resolved-name (x-resolve-font-name font))
-             (setq xlfd-fields (x-decompose-font-name font)))
-        (if (string= "fontset"
-                     (aref xlfd-fields xlfd-regexp-registry-subnum))
-            (new-fontset font
-                         (x-complement-fontset-spec xlfd-fields nil))
-          ;; Create a fontset from FONT.  The fontset name is
-          ;; generated from FONT.
-          (create-fontset-from-ascii-font font
-                                          resolved-name "startup"))))
 
   ;; Apply a geometry resource to the initial frame.  Put it at the end
   ;; of the alist, so that anything specified on the command line takes