diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-06-03 09:51:18 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-06-03 09:51:18 +0300 |
| commit | 0031c9530d24fb25d8bdcadaf7457b7dee51da0c (patch) | |
| tree | 0af47de2177ab3b9cd5c552b760a6d774701ef11 /src/w32menu.c | |
| parent | 0882152e225d4cb722782545441fd38a22cacef5 (diff) | |
| download | emacs-0031c9530d24fb25d8bdcadaf7457b7dee51da0c.tar.gz | |
Fix MS-Windows build broken by menu changes on 2014-06-02.
src/w32menu.c (w32_menu_show): Fix a typo that broke compilation.
src/menu.h (enum button_type, struct _widget_value) [HAVE_NTGUI]:
Define instead of including ../lwlib/lwlib.h, which causes
compilation errors due to missing X11 headers.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 36b06bafad2..467eb7a5710 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -697,7 +697,7 @@ w32_menu_show (struct frame *f, int x, int y, int for_click, int keymaps, ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip); } - wv = make_widget_value (SSDATA (item_name), NULL, !NILP (enabled), + wv = make_widget_value (SSDATA (item_name), NULL, !NILP (enable), STRINGP (help) ? help : Qnil); if (prev_wv) prev_wv->next = wv; |