diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-06-06 12:33:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-06-06 12:33:19 -0700 |
| commit | 5dda54d600664bdff6b9e76773c4f29fd7e39915 (patch) | |
| tree | 62571d3a96008b020a7edea83673e16eef4dbd15 | |
| parent | 3112e4002cb1a29861bd7ae1b7ddff0dbdaa38a7 (diff) | |
| download | emacs-5dda54d600664bdff6b9e76773c4f29fd7e39915.tar.gz | |
* term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.
* menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/menu.h | 6 | ||||
| -rw-r--r-- | src/term.c | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9c17d3d1dbc..0ba73e59553 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-06-06 Paul Eggert <eggert@cs.ucla.edu> + + * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static. + * menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl. + 2014-06-06 Stefan Monnier <monnier@iro.umontreal.ca> * window.c (Frecenter): Signal an error if window-buffer is not diff --git a/src/menu.h b/src/menu.h index e2d7601378e..5b15294754d 100644 --- a/src/menu.h +++ b/src/menu.h @@ -29,7 +29,7 @@ extern Lisp_Object Qunsupported__w32_dialog; /* Bit fields used by terminal-specific menu_show_hook. */ enum { - MENU_KEYMAPS = 0x1, + MENU_KEYMAPS = 0x1, MENU_FOR_CLICK = 0x2, MENU_KBD_NAVIGATION = 0x4 }; @@ -64,12 +64,12 @@ extern Lisp_Object x_menu_show (struct frame *, int, int, int, #ifdef HAVE_NTGUI extern Lisp_Object w32_menu_show (struct frame *, int, int, int, Lisp_Object, const char **); +extern Lisp_Object tty_menu_show (struct frame *, int, int, int, + Lisp_Object, const char **); #endif #ifdef HAVE_NS extern Lisp_Object ns_menu_show (struct frame *, int, int, int, Lisp_Object, const char **); #endif -extern Lisp_Object tty_menu_show (struct frame *, int, int, int, - Lisp_Object, const char **); extern ptrdiff_t menu_item_width (const unsigned char *); #endif /* MENU_H */ diff --git a/src/term.c b/src/term.c index aa0be9871c8..f38deb8f4f1 100644 --- a/src/term.c +++ b/src/term.c @@ -3582,6 +3582,9 @@ tty_menu_new_item_coords (struct frame *f, int which, int *x, int *y) } } +#ifndef HAVE_NTGUI +static +#endif Lisp_Object tty_menu_show (struct frame *f, int x, int y, int menuflags, Lisp_Object title, const char **error_name) |