diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-07-31 19:59:55 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-07-31 19:59:55 +0300 |
| commit | 5b20b3cc462133108a804abb74b8cf7fc6964ead (patch) | |
| tree | b9bebe2499d258882bd7334ecdf23ddfd559c63d /src/fontset.c | |
| parent | 79e721e0f886f048bafd46e8dec6630e035e6ed4 (diff) | |
| download | emacs-5b20b3cc462133108a804abb74b8cf7fc6964ead.tar.gz | |
Fix some of the breakage introduced with 2012-07-31T12:36:19Z!dmantipov@yandex.ru.
src/w32menu.c (w32_menu_show): Revert bogus introduction of FVAR.
src/fontset.c (dump_fontset): Fix compilation with ENABLE_CHECKING
after introduction of FVAR.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c index f3bf221f249..1efcc3ee4ec 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -2117,7 +2117,8 @@ dump_fontset (Lisp_Object fontset) if (FRAME_LIVE_P (f)) ASET (vec, 1, - Fcons (FONTSET_NAME (FONTSET_BASE (fontset)), f->name)); + Fcons (FONTSET_NAME (FONTSET_BASE (fontset)), + FVAR (f, name))); else ASET (vec, 1, Fcons (FONTSET_NAME (FONTSET_BASE (fontset)), Qnil)); |