Mercurial > emacs
changeset 90247:b82766aee45f
Delete the code to create a fontset from the X resource "Font".
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Tue, 18 Oct 2005 10:30:24 +0000 |
| parents | b45f998a92aa |
| children | c8c3c8dbe333 |
| files | lisp/term/mac-win.el |
| diffstat | 1 files changed, 0 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/mac-win.el Mon Oct 17 04:16:02 2005 +0000 +++ b/lisp/term/mac-win.el Tue Oct 18 10:30:24 2005 +0000 @@ -1639,31 +1639,6 @@ ;; 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.