Mercurial > emacs
changeset 74625:1fb421aafa71
(mac-atsu-font-table): Remove defvar.
(mac-handle-font-selection): Use mac-atsu-font-face-attributes
instead of mac-atsu-font-table.
(fontset-default): Specify argument MAXIMUM in x-list-fonts calls.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Fri, 15 Dec 2006 08:04:47 +0000 |
| parents | 0245a94c8ed9 |
| children | 04ef1ad19c59 |
| files | lisp/term/mac-win.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/mac-win.el Fri Dec 15 02:13:51 2006 +0000 +++ b/lisp/term/mac-win.el Fri Dec 15 08:04:47 2006 +0000 @@ -82,7 +82,6 @@ (defvar mac-service-selection) (defvar mac-system-script-code) (defvar mac-apple-event-map) -(defvar mac-atsu-font-table) (defvar mac-font-panel-mode) (defvar mac-ts-active-input-overlay) (defvar x-invocation-args) @@ -1791,7 +1790,8 @@ (let* ((ae (mac-event-ae event)) (fm-font-size (mac-ae-number ae "fmsz")) (atsu-font-id (mac-ae-number ae "auid")) - (attribute-values (gethash atsu-font-id mac-atsu-font-table))) + (attribute-values (and atsu-font-id + (mac-atsu-font-face-attributes atsu-font-id)))) (if fm-font-size (setq attribute-values `(:height ,(* 10 fm-font-size) ,@attribute-values))) @@ -2459,7 +2459,7 @@ ;; Setup the default fontset. (setup-default-fontset) -(cond ((x-list-fonts "*-iso10646-1") +(cond ((x-list-fonts "*-iso10646-1" nil nil 1) ;; Use ATSUI (if available) for the following charsets. (dolist (charset '(latin-iso8859-1 @@ -2471,7 +2471,7 @@ vietnamese-viscii-lower vietnamese-viscii-upper lao ethiopic tibetan)) (set-fontset-font nil charset '(nil . "iso10646-1")))) - ((null (x-list-fonts "*-iso8859-1")) + ((null (x-list-fonts "*-iso8859-1" nil nil 1)) ;; Add Mac-encoding fonts unless ETL fonts are installed. (fontset-add-mac-fonts "fontset-default")))