aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2005-10-18 10:30:24 +0000
committerYAMAMOTO Mitsuharu2005-10-18 10:30:24 +0000
commit4ab223a0674b16aeb79fa66db50846d0289a44cd (patch)
tree691c4bbf333a78fb23986ef0111c34ff250d7f92
parenta622537b0cecde5bad26bbbf631936fbd38d80ea (diff)
downloademacs-4ab223a0674b16aeb79fa66db50846d0289a44cd.tar.gz
emacs-4ab223a0674b16aeb79fa66db50846d0289a44cd.zip
Delete the code to create a fontset from the X resource "Font".
-rw-r--r--lisp/term/mac-win.el25
1 files changed, 0 insertions, 25 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 6f87f098f0b..a2b509f071c 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1639,31 +1639,6 @@ It returns a name of the created fontset."
1639;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...). 1639;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
1640(create-fontset-from-x-resource) 1640(create-fontset-from-x-resource)
1641 1641
1642;; Try to create a fontset from a font specification which comes
1643;; from initial-frame-alist, default-frame-alist, or X resource.
1644;; A font specification in command line argument (i.e. -fn XXXX)
1645;; should be already in default-frame-alist as a `font'
1646;; parameter. However, any font specifications in site-start
1647;; library, user's init file (.emacs), and default.el are not
1648;; yet handled here.
1649
1650(let ((font (or (cdr (assq 'font initial-frame-alist))
1651 (cdr (assq 'font default-frame-alist))
1652 (x-get-resource "font" "Font")))
1653 xlfd-fields resolved-name)
1654 (if (and font
1655 (not (query-fontset font))
1656 (setq resolved-name (x-resolve-font-name font))
1657 (setq xlfd-fields (x-decompose-font-name font)))
1658 (if (string= "fontset" (aref xlfd-fields xlfd-regexp-registry-subnum))
1659 (new-fontset font (x-complement-fontset-spec xlfd-fields nil))
1660 ;; Create a fontset from FONT. The fontset name is
1661 ;; generated from FONT.
1662 (if (and (string= "mac" (aref xlfd-fields xlfd-regexp-registry-subnum))
1663 (string= "roman" (aref xlfd-fields xlfd-regexp-encoding-subnum)))
1664 (create-fontset-from-mac-roman-font font resolved-name "startup")
1665 (create-fontset-from-ascii-font font resolved-name "startup")))))
1666
1667;; Apply a geometry resource to the initial frame. Put it at the end 1642;; Apply a geometry resource to the initial frame. Put it at the end
1668;; of the alist, so that anything specified on the command line takes 1643;; of the alist, so that anything specified on the command line takes
1669;; precedence. 1644;; precedence.