aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2009-11-09 11:07:05 +0000
committerJuanma Barranquero2009-11-09 11:07:05 +0000
commit04e452cb3175d95a69be7a8c1110c2ed790ccb54 (patch)
treee7897d3b3b071baf9f8f7cee920a8bcb25ead554 /src
parentef7417fd760526133c9217e7857ac7111263c46d (diff)
downloademacs-04e452cb3175d95a69be7a8c1110c2ed790ccb54.tar.gz
emacs-04e452cb3175d95a69be7a8c1110c2ed790ccb54.zip
* menu.c [HAVE_NTGUI]: Declare current_popup_menu.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/menu.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4199b716a78..4ef3776e632 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-11-09 Juanma Barranquero <lekktu@gmail.com>
2
3 * menu.c [HAVE_NTGUI]: Declare current_popup_menu.
4
12009-11-09 Stefan Monnier <monnier@iro.umontreal.ca> 52009-11-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c, 7 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
diff --git a/src/menu.c b/src/menu.c
index 2af6e8573e7..0c46d8dc6cf 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -50,6 +50,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
50#include "w32term.h" 50#include "w32term.h"
51 51
52extern AppendMenuW_Proc unicode_append_menu; 52extern AppendMenuW_Proc unicode_append_menu;
53extern HMENU current_popup_menu;
53 54
54#endif /* HAVE_NTGUI */ 55#endif /* HAVE_NTGUI */
55 56