Commit 5fecafe7 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(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.
parent 216f14d3
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
(defvar mac-service-selection) (defvar mac-service-selection)
(defvar mac-system-script-code) (defvar mac-system-script-code)
(defvar mac-apple-event-map) (defvar mac-apple-event-map)
(defvar mac-atsu-font-table)
(defvar mac-font-panel-mode) (defvar mac-font-panel-mode)
(defvar mac-ts-active-input-overlay) (defvar mac-ts-active-input-overlay)
(defvar x-invocation-args) (defvar x-invocation-args)
...@@ -1791,7 +1790,8 @@ With numeric ARG, display the font panel if and only if ARG is positive." ...@@ -1791,7 +1790,8 @@ With numeric ARG, display the font panel if and only if ARG is positive."
(let* ((ae (mac-event-ae event)) (let* ((ae (mac-event-ae event))
(fm-font-size (mac-ae-number ae "fmsz")) (fm-font-size (mac-ae-number ae "fmsz"))
(atsu-font-id (mac-ae-number ae "auid")) (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 (if fm-font-size
(setq attribute-values (setq attribute-values
`(:height ,(* 10 fm-font-size) ,@attribute-values))) `(:height ,(* 10 fm-font-size) ,@attribute-values)))
...@@ -2459,7 +2459,7 @@ It returns a name of the created fontset." ...@@ -2459,7 +2459,7 @@ It returns a name of the created fontset."
;; Setup the default fontset. ;; Setup the default fontset.
(setup-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. ;; Use ATSUI (if available) for the following charsets.
(dolist (dolist
(charset '(latin-iso8859-1 (charset '(latin-iso8859-1
...@@ -2471,7 +2471,7 @@ It returns a name of the created fontset." ...@@ -2471,7 +2471,7 @@ It returns a name of the created fontset."
vietnamese-viscii-lower vietnamese-viscii-upper vietnamese-viscii-lower vietnamese-viscii-upper
lao ethiopic tibetan)) lao ethiopic tibetan))
(set-fontset-font nil charset '(nil . "iso10646-1")))) (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. ;; Add Mac-encoding fonts unless ETL fonts are installed.
(fontset-add-mac-fonts "fontset-default"))) (fontset-add-mac-fonts "fontset-default")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment