diff options
| author | Jan Djärv | 2009-11-10 07:58:57 +0000 |
|---|---|---|
| committer | Jan Djärv | 2009-11-10 07:58:57 +0000 |
| commit | 1fb99a3a639af18a092a9591f577fbec92ca231c (patch) | |
| tree | 942ebc79e081fcca6c24b69c3af4b6777f764f9a /src | |
| parent | 032c33996ae4358d9a7d99cb852146bb08e06352 (diff) | |
| download | emacs-1fb99a3a639af18a092a9591f577fbec92ca231c.tar.gz emacs-1fb99a3a639af18a092a9591f577fbec92ca231c.zip | |
xmenu.c (xmenu_show): Must not be static after 2009-11-09 changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xmenu.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bd2f6b602ac..34df65ee455 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-11-10 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xmenu.c (xmenu_show): Must not be static after 2009-11-09 changes. | ||
| 4 | |||
| 1 | 2009-11-09 Juanma Barranquero <lekktu@gmail.com> | 5 | 2009-11-09 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * menu.c [HAVE_NTGUI]: Declare current_popup_menu. | 7 | * menu.c [HAVE_NTGUI]: Declare current_popup_menu. |
diff --git a/src/xmenu.c b/src/xmenu.c index 601767d768f..15e609199b5 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -2315,7 +2315,7 @@ pop_down_menu (arg) | |||
| 2315 | } | 2315 | } |
| 2316 | 2316 | ||
| 2317 | 2317 | ||
| 2318 | static Lisp_Object | 2318 | Lisp_Object |
| 2319 | xmenu_show (f, x, y, for_click, keymaps, title, error, timestamp) | 2319 | xmenu_show (f, x, y, for_click, keymaps, title, error, timestamp) |
| 2320 | FRAME_PTR f; | 2320 | FRAME_PTR f; |
| 2321 | int x, y; | 2321 | int x, y; |