Mercurial > emacs
changeset 89358:9e9727d23842
Delete the code to create a fontset from the X resource "Font".
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 10 Jan 2003 07:37:08 +0000 |
| parents | 8f8c7d4c2e6e |
| children | 891cceb4d305 |
| files | lisp/term/x-win.el |
| diffstat | 1 files changed, 0 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/x-win.el Fri Jan 10 07:35:06 2003 +0000 +++ b/lisp/term/x-win.el Fri Jan 10 07:37:08 2003 +0000 @@ -2103,28 +2103,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. - (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\\."