Mercurial > emacs
diff lisp/term/mac-win.el @ 90140:02f1dbc4a199
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 09 Apr 2005 02:16:29 +0000 |
parents | 30ad2795fdab de40dfe68257 |
children | 146c086df160 |
line wrap: on
line diff
--- a/lisp/term/mac-win.el Sat Apr 09 01:45:41 2005 +0000 +++ b/lisp/term/mac-win.el Sat Apr 09 02:16:29 2005 +0000 @@ -1178,7 +1178,10 @@ (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")))) + (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