diff options
| author | Juanma Barranquero | 2010-07-23 12:32:02 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-07-23 12:32:02 +0200 |
| commit | 94da839793affa2a270bc26cee9c4d95d4dc4708 (patch) | |
| tree | 8c0f6d85d593c14b1f95c26e1d102aba14e1118c /src | |
| parent | 2e6c8532c79e7148c63eadd32dd9006d388616a7 (diff) | |
| download | emacs-94da839793affa2a270bc26cee9c4d95d4dc4708.tar.gz emacs-94da839793affa2a270bc26cee9c4d95d4dc4708.zip | |
* menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS".
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/menu.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2e8b8484a1b..6a0475f5741 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-07-23 Juanma Barranquero <lekktu@gmail.com> | 1 | 2010-07-23 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS"; | ||
| 4 | it is called only from NS code. | ||
| 5 | |||
| 3 | * w32term.c (my_set_focus): #ifdef away; it is called only from | 6 | * w32term.c (my_set_focus): #ifdef away; it is called only from |
| 4 | "#ifdef 0" code. | 7 | "#ifdef 0" code. |
| 5 | 8 | ||
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. */ |