diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/w32menu.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 72e0cab2ce8..7a946d2dc75 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -98,8 +98,6 @@ AppendMenuW_Proc unicode_append_menu = NULL; | |||
| 98 | MessageBoxW_Proc unicode_message_box = NULL; | 98 | MessageBoxW_Proc unicode_message_box = NULL; |
| 99 | #endif /* NTGUI_UNICODE */ | 99 | #endif /* NTGUI_UNICODE */ |
| 100 | 100 | ||
| 101 | Lisp_Object Qdebug_on_next_call, Qunsupported__w32_dialog; | ||
| 102 | |||
| 103 | void set_frame_menubar (struct frame *, bool, bool); | 101 | void set_frame_menubar (struct frame *, bool, bool); |
| 104 | 102 | ||
| 105 | #ifdef HAVE_DIALOGS | 103 | #ifdef HAVE_DIALOGS |