diff options
| author | Paul Eggert | 2012-10-10 17:26:58 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-10-10 17:26:58 -0700 |
| commit | e85aafe7bd42773bf517193397c1a0ef0ed6b4a6 (patch) | |
| tree | 17291d42538b1fdd15f86e2176959687b2a703e2 /src | |
| parent | 9fa1de305acd530060062a1470f3018de7937bb1 (diff) | |
| download | emacs-e85aafe7bd42773bf517193397c1a0ef0ed6b4a6.tar.gz emacs-e85aafe7bd42773bf517193397c1a0ef0ed6b4a6.zip | |
* nsmenu.m (waiting_for_input): Remove wrong decl.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsmenu.m | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index daa370105ee..19a19e7668c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-10-11 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * nsmenu.m (waiting_for_input): Remove wrong decl. | ||
| 4 | |||
| 1 | 2012-10-10 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-10-10 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | keyboard.c, keymap.c: Use bool for booleans. | 7 | keyboard.c, keymap.c: Use bool for booleans. |
diff --git a/src/nsmenu.m b/src/nsmenu.m index df8b3ea3e54..a5983c70cdb 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -128,7 +128,6 @@ 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; | ||
| 132 | bool owfi; | 131 | bool 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; |