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 | |
| 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')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/fontset.c | 3 | ||||
| -rw-r--r-- | src/w32menu.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 41b87fc803e..00be648ec91 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-07-31 Eli Zaretskii <eliz@gnu.org> + + * w32menu.c (w32_menu_show): Revert bogus introduction of FVAR. + + * fontset.c (dump_fontset): Fix compilation with ENABLE_CHECKING + after introduction of FVAR. + 2012-07-31 Jan Djärv <jan.h.d@swipnet.se> * nsmenu.m (update_frame_tool_bar): Change key from NSObject* to id. 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)); diff --git a/src/w32menu.c b/src/w32menu.c index 27d8bb2ad9d..193a8182481 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -854,7 +854,7 @@ w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, wv_title->name = SSDATA (title); wv_title->enabled = TRUE; - FVAR (wv_title, title) = TRUE; + wv_title->title = TRUE; wv_title->button_type = BUTTON_TYPE_NONE; wv_title->help = Qnil; wv_title->next = wv_sep; |