[Emacs-diffs] Changes to emacs/lisp/term/mac-win.el,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   06/12/15 08:04:47

Index: mac-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/mac-win.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- mac-win.el  9 Dec 2006 03:48:07 -0000       1.81
+++ mac-win.el  15 Dec 2006 08:04:47 -0000      1.82
@@ -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")))