From: Kenichi Handa <handa@m17n.org>
Date: Fri, 10 Jan 2003 07:37:08 +0000 (+0000)
Subject: Delete the code to create a fontset from the X resource "Font".
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~108
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3459fd2f4d8ad3e98eea74cad01123242fdd431;p=emacs.git

Delete the code to create a fontset from the X resource "Font".
---

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 4b0c75f6a85..a7d47926e8e 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2103,28 +2103,6 @@ This is in addition to, but in preference to, the primary selection."
 ;; 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"))))
-
 ;; Sun expects the menu bar cut and paste commands to use the clipboard.
 ;; This has ,? to match both on Sunos and on Solaris.
 (if (string-match "Sun Microsystems,? Inc\\."