diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/w32menu.c | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 287062c702c..7a946d2dc75 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Menu support for GNU Emacs on the Microsoft Windows API. | 1 | /* Menu support for GNU Emacs on the Microsoft Windows API. |
| 2 | Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2014 Free | 2 | Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2015 Free |
| 3 | Software Foundation, Inc. | 3 | Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -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 |