Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some of the breakage introduced with 2012-07-31T12:36:19Z!dmantipov@yandex.ru.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2012-07-31 19:59:55 +03:00
parent 79e721e0f8
commit 5b20b3cc46
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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.

3
src/fontset.c
View file

@ -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));

2
src/w32menu.c
View file

@ -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;