aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsmenu.m
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/nsmenu.m
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/nsmenu.m')
-rw-r--r--src/nsmenu.m8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m
index ffd1e4db78a..26fe26e5e0d 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1,5 +1,5 @@
1/* NeXT/Open/GNUstep and MacOSX Cocoa menu and toolbar module. 1/* NeXT/Open/GNUstep and MacOSX Cocoa menu and toolbar module.
2 Copyright (C) 2007-2014 Free Software Foundation, Inc. 2 Copyright (C) 2007-2015 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -59,12 +59,6 @@ int menu_trace_num = 0;
59#include "nsmenu_common.c" 59#include "nsmenu_common.c"
60#endif 60#endif
61 61
62extern Lisp_Object Qundefined, Qmenu_enable, Qmenu_bar_update_hook;
63extern Lisp_Object QCtoggle, QCradio;
64
65Lisp_Object Qdebug_on_next_call;
66extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
67
68extern long context_menu_value; 62extern long context_menu_value;
69EmacsMenu *mainMenu, *svcsMenu, *dockMenu; 63EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
70 64