diff options
| author | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
| commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
| tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /lisp/term/mac-win.el | |
| parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
| parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
| download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.bz2 emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'lisp/term/mac-win.el')
| -rw-r--r-- | lisp/term/mac-win.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 6569918603f..c49c8893b21 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1,6 +1,6 @@ ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8 -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Andrew Choi <akochoi@mac.com> @@ -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) @@ -1841,7 +1840,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))) |