diff options
| author | Stefan Monnier | 2013-11-28 20:22:40 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-11-28 20:22:40 -0500 |
| commit | 7cdf484be3f4408b2bdf58db5bd4ae896cf262e5 (patch) | |
| tree | 3ee6b7c62a3385518f09e5ade6a879bd1b41f53c /nt/inc | |
| parent | ef869611180c862f67ef1e004553668523615d37 (diff) | |
| download | emacs-7cdf484be3f4408b2bdf58db5bd4ae896cf262e5.tar.gz emacs-7cdf484be3f4408b2bdf58db5bd4ae896cf262e5.zip | |
* configure.ac (HAVE_MENUS): Remove.
* src/xmenu.c (Fmenu_or_popup_active_p):
* src/window.c (Fset_window_configuration):
* src/menu.c (Fx_popup_menu, Fx_popup_dialog):
* src/keyboard.c (record_menu_key, read_char_x_menu_prompt):
* src/fns.c (Fyes_or_no_p):
* src/editfns.c (Fmessage_box, Fmessage_or_box):
* src/alloc.c (make_save_ptr_ptr):
* src/xdisp.c, src/w32menu.c, src/term.c, src/xterm.h, src/xterm.c:
Remove HAVE_MENUS.
Diffstat (limited to 'nt/inc')
| -rw-r--r-- | nt/inc/ms-w32.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index e27ae4daf4f..cd6ec1725d6 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h | |||
| @@ -156,9 +156,6 @@ extern char *getenv (); | |||
| 156 | # ifndef HAVE_WINDOW_SYSTEM | 156 | # ifndef HAVE_WINDOW_SYSTEM |
| 157 | # define HAVE_WINDOW_SYSTEM 1 | 157 | # define HAVE_WINDOW_SYSTEM 1 |
| 158 | # endif | 158 | # endif |
| 159 | # ifndef HAVE_MENUS | ||
| 160 | # define HAVE_MENUS 1 | ||
| 161 | # endif | ||
| 162 | #endif | 159 | #endif |
| 163 | 160 | ||
| 164 | /* Get some redefinitions in place. */ | 161 | /* Get some redefinitions in place. */ |
| @@ -176,7 +173,7 @@ extern char *getenv (); | |||
| 176 | extern struct tm * sys_localtime (const time_t *); | 173 | extern struct tm * sys_localtime (const time_t *); |
| 177 | /* MinGW64 uses a 2-argument _setjmp, and setjmp is a macro defined to | 174 | /* MinGW64 uses a 2-argument _setjmp, and setjmp is a macro defined to |
| 178 | supply the 2nd arg correctly, so don't use _setjmp directly in that | 175 | supply the 2nd arg correctly, so don't use _setjmp directly in that |
| 179 | case. */ | 176 | case. */ |
| 180 | #undef HAVE__SETJMP | 177 | #undef HAVE__SETJMP |
| 181 | #endif | 178 | #endif |
| 182 | 179 | ||