mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-15 03:11:54 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
YAMAMOTO Mitsuharu 2005-10-18 10:30:24 +00:00
parent a622537b0c
commit 4ab223a067
1 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lisp/term/mac-win.el
View file

@ -1639,31 +1639,6 @@ It returns a name of the created fontset."
;; 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.
(if (and (string= "mac" (aref xlfd-fields xlfd-regexp-registry-subnum))
(string= "roman" (aref xlfd-fields xlfd-regexp-encoding-subnum)))
(create-fontset-from-mac-roman-font font resolved-name "startup")
(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
;; precedence.