diff options
| author | Kenichi Handa | 2012-10-11 20:29:47 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-11 20:29:47 +0900 |
| commit | d3e4228575e9ba9e99dc4a7dae788280ffcc4566 (patch) | |
| tree | 97d35f3c0766372c166a31f3c0f7aba791a38dde /src/nsmenu.m | |
| parent | cde44a7728488ca6bc6a46c18d9c5e647b160547 (diff) | |
| parent | fd2f90cf5c6a15610aa1e17e73d6d8a5f8cb1999 (diff) | |
| download | emacs-d3e4228575e9ba9e99dc4a7dae788280ffcc4566.tar.gz emacs-d3e4228575e9ba9e99dc4a7dae788280ffcc4566.zip | |
merge trunk
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 9af732c6c45..a5983c70cdb 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -128,8 +128,7 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu) | |||
| 128 | static EmacsMenu *last_submenu = nil; | 128 | static EmacsMenu *last_submenu = nil; |
| 129 | BOOL needsSet = NO; | 129 | BOOL needsSet = NO; |
| 130 | const char *submenuTitle = [[submenu title] UTF8String]; | 130 | const char *submenuTitle = [[submenu title] UTF8String]; |
| 131 | extern int waiting_for_input; | 131 | bool owfi; |
| 132 | int owfi; | ||
| 133 | Lisp_Object items; | 132 | Lisp_Object items; |
| 134 | widget_value *wv, *first_wv, *prev_wv = 0; | 133 | widget_value *wv, *first_wv, *prev_wv = 0; |
| 135 | int i; | 134 | int i; |