procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl.
This commit is contained in:
Paul Eggert 2014-06-06 12:33:19 -07:00
parent 3112e4002c
commit 5dda54d600
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

6
src/menu.h
View file

@ -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 */

3
src/term.c
View file

@ -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)