aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.h
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /src/menu.h
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/menu.h')
-rw-r--r--src/menu.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/menu.h b/src/menu.h
index 4dd7f17dca6..de586a5e101 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,5 +1,5 @@
1/* Functions to manipulate menus. 1/* Functions to manipulate menus.
2 Copyright (C) 2008-2014 Free Software Foundation, Inc. 2 Copyright (C) 2008-2015 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -22,10 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22#include "systime.h" /* for Time */ 22#include "systime.h" /* for Time */
23#include "../lwlib/lwlib-widget.h" 23#include "../lwlib/lwlib-widget.h"
24 24
25#ifdef HAVE_NTGUI
26extern Lisp_Object Qunsupported__w32_dialog;
27#endif
28
29/* Bit fields used by terminal-specific menu_show_hook. */ 25/* Bit fields used by terminal-specific menu_show_hook. */
30 26
31enum { 27enum {