Merge from emacs--devo--0

[gnu-emacs] / lisp / term / w32-win.el

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index fd5ccc0aceeb5323ec91495bad723bbafcd8dec8..a9bd19f9a3d4625b3f4bcd12a0edb5878d2d1fd8 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -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
@@ -1096,7 +1095,7 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
       ;; Append list of fontsets currently defined.
       ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
       (if (fboundp 'new-fontset)
-      (append w32-fixed-font-alist (list (generate-fontset-menu)))))))
+          (append w32-fixed-font-alist (list (generate-fontset-menu)))))))
   (if fonts
       (let (font)
        (while fonts
@@ -1148,43 +1147,19 @@ 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.
   (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