diff options
| author | Kenichi Handa | 2010-07-26 13:29:08 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-07-26 13:29:08 +0900 |
| commit | 50efd41b43c9b1b540c49c53d4e7824468ec7879 (patch) | |
| tree | 4a3be8d0322c537816f47a0c6450fc13495edf35 /src/menu.c | |
| parent | dfe3c90fa5974e200483297e11bb889d0589b8f5 (diff) | |
| parent | 7d383292d10b876efec43e77fd51c2665e912688 (diff) | |
| download | emacs-50efd41b43c9b1b540c49c53d4e7824468ec7879.tar.gz emacs-50efd41b43c9b1b540c49c53d4e7824468ec7879.zip | |
merge trunk
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/menu.c b/src/menu.c index a424200fb3e..321dc2677a1 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -133,12 +133,14 @@ discard_menu_items (void) | |||
| 133 | xassert (NILP (menu_items_inuse)); | 133 | xassert (NILP (menu_items_inuse)); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | #ifdef HAVE_NS | ||
| 136 | static Lisp_Object | 137 | static Lisp_Object |
| 137 | cleanup_popup_menu (Lisp_Object arg) | 138 | cleanup_popup_menu (Lisp_Object arg) |
| 138 | { | 139 | { |
| 139 | discard_menu_items (); | 140 | discard_menu_items (); |
| 140 | return Qnil; | 141 | return Qnil; |
| 141 | } | 142 | } |
| 143 | #endif | ||
| 142 | 144 | ||
| 143 | /* This undoes save_menu_items, and it is called by the specpdl unwind | 145 | /* This undoes save_menu_items, and it is called by the specpdl unwind |
| 144 | mechanism. */ | 146 | mechanism. */ |