Commit 5dda54d6 authored by Paul Eggert's avatar Paul Eggert

* term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.

* menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl.
parent 3112e400
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
......
......@@ -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 */
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment