From: YAMAMOTO Mitsuharu Date: Fri, 15 Dec 2006 08:04:47 +0000 (+0000) Subject: (mac-atsu-font-table): Remove defvar. X-Git-Tag: emacs-pretest-22.0.92~118 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fecafe7077077759258bb8d97e9a0bedff8c8dd;p=emacs.git (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. --- diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index bcd8a38fcac..cba4985ccb3 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -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 @@ With numeric ARG, display the font panel if and only if ARG is positive." (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 @@ It returns a name of the created fontset." ;; 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 @@ It returns a name of the created fontset." 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")))