Mercurial > hg > xemacs-beta
diff lisp/w3/font.el @ 38:1a767b41a199 r19-15b102
Import from CVS: tag r19-15b102
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:54:01 +0200 |
parents | e04119814345 |
children | 6a22abad6937 |
line wrap: on
line diff
--- a/lisp/w3/font.el Mon Aug 13 08:53:41 2007 +0200 +++ b/lisp/w3/font.el Mon Aug 13 08:54:01 2007 +0200 @@ -1,7 +1,7 @@ ;;; font.el --- New font model ;; Author: wmperry -;; Created: 1997/03/10 15:18:19 -;; Version: 1.36 +;; Created: 1997/03/19 18:28:10 +;; Version: 1.38 ;; Keywords: faces ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -61,7 +61,7 @@ (defconst font-window-system-mappings '((x . (x-font-create-name x-font-create-object)) (ns . (ns-font-create-name ns-font-create-object)) - (win32 . (x-font-create-name x-font-create-object)) ; Change? FIXME + (win32 . (x-font-create-name x-font-create-object)) (pm . (x-font-create-name x-font-create-object)) ; Change? FIXME (tty . (tty-font-create-plist tty-font-create-object))) "An assoc list mapping device types to the function used to create @@ -530,7 +530,7 @@ (normal (mapcar (function (lambda (x) (if x (aref x 0)))) (aref menu 1)))) (sort (unique (nconc scaled normal)) 'string-lessp)))) - (mapcar 'car font-family-mappings))) + (cons "monospace" (mapcar 'car font-family-mappings)))) (defvar font-default-cache nil) @@ -569,7 +569,7 @@ ;; (if font-running-xemacs ;; (format "%dpx" (face-height 'default device)) (font-size (font-default-object-for-device device))) - + (defun x-font-create-name (fontobj &optional device) (if (and (not (or (font-family fontobj) (font-weight fontobj)