Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 13:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix last commit in w32term.c.

Browse source 
src/w32term.h (current_popup_menu, menubar_in_use): Move
 declarations from w32term.c.
This commit is contained in:
Eli Zaretskii 2014-07-25 14:58:36 +03:00
parent b61f5e45ec
commit 4e69163f5f
3 changed files with 9 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-07-25 Eli Zaretskii <eliz@gnu.org>
* w32term.h (current_popup_menu, menubar_in_use): Move
declarations from w32term.c.
2014-07-25 Martin Rudalics <rudalics@gmx.at>
* w32fns.c (menubar_in_use): No more static.

3
src/w32term.c
View file

@ -93,9 +93,6 @@ extern void free_frame_menubar (struct frame *);
extern int w32_codepage_for_font (char *fontname);
extern Cursor w32_load_cursor (LPCTSTR name);
extern HMENU current_popup_menu;
extern int menubar_in_use;
#define x_any_window_to_frame x_window_to_frame
#define x_top_window_to_frame x_window_to_frame

4
src/w32term.h
View file

@ -200,6 +200,10 @@ struct w32_display_info
extern struct w32_display_info *x_display_list;
extern struct w32_display_info one_w32_display_info;
/* These 2 are set by w32fns.c and examined in w32term.c. */
extern HMENU current_popup_menu;
extern int menubar_in_use;
extern struct frame *x_window_to_frame (struct w32_display_info *, HWND);
struct w32_display_info *x_display_info_for_name (Lisp_Object);