diff options
| author | Stefan Monnier | 2009-11-10 18:07:09 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-11-10 18:07:09 +0000 |
| commit | 045b83c00aabaaaa5d4e363f848a1826f8f27338 (patch) | |
| tree | 74140e9884a02660908aa4427d37550bd5e602e1 /src | |
| parent | 693737cdfd3f9dd28404c187ba66d2da31621a5f (diff) | |
| download | emacs-045b83c00aabaaaa5d4e363f848a1826f8f27338.tar.gz emacs-045b83c00aabaaaa5d4e363f848a1826f8f27338.zip | |
(Fx_popup_menu) [HAVE_NS]: Remove unused vars.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/menu.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 34df65ee455..ae1a234679d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-11-10 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * menu.c (Fx_popup_menu) [HAVE_NS]: Remove unused vars. | ||
| 4 | |||
| 1 | 2009-11-10 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2009-11-10 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * xmenu.c (xmenu_show): Must not be static after 2009-11-09 changes. | 7 | * xmenu.c (xmenu_show): Must not be static after 2009-11-09 changes. |
diff --git a/src/menu.c b/src/menu.c index 0c46d8dc6cf..44eebe8dbe7 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -1073,11 +1073,6 @@ no quit occurs and `x-popup-menu' returns nil. */) | |||
| 1073 | int specpdl_count = SPECPDL_INDEX (); | 1073 | int specpdl_count = SPECPDL_INDEX (); |
| 1074 | Lisp_Object timestamp = Qnil; | 1074 | Lisp_Object timestamp = Qnil; |
| 1075 | struct gcpro gcpro1; | 1075 | struct gcpro gcpro1; |
| 1076 | #ifdef HAVE_NS | ||
| 1077 | EmacsMenu *pmenu; | ||
| 1078 | int specpdl_count2; | ||
| 1079 | widget_value *wv, *first_wv = 0; | ||
| 1080 | #endif | ||
| 1081 | 1076 | ||
| 1082 | #ifdef HAVE_NS | 1077 | #ifdef HAVE_NS |
| 1083 | NSTRACE (ns_popup_menu); | 1078 | NSTRACE (ns_popup_menu); |