[Emacs-diffs] trunk r117573: Fix last commit in w32term.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117573
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2014-07-25 14:58:36 +0300
message:
  Fix last commit in w32term.c.
  
   src/w32term.h (current_popup_menu, menubar_in_use): Move
   declarations from w32term.c.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950
  src/w32term.h                  w32term.h-20091113204419-o5vbwnq5f7feedwu-954

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-25 09:29:23 +0000
+++ b/src/ChangeLog     2014-07-25 11:58:36 +0000
@@ -1,3 +1,8 @@
+2014-07-25  Eli Zaretskii  <address@hidden>
+
+       * w32term.h (current_popup_menu, menubar_in_use): Move
+       declarations from w32term.c.
+
 2014-07-25  Martin Rudalics  <address@hidden>
 
        * w32fns.c (menubar_in_use): No more static.

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2014-07-25 09:29:23 +0000
+++ b/src/w32term.c     2014-07-25 11:58:36 +0000
@@ -93,9 +93,6 @@
 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
 

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2014-07-25 06:01:39 +0000
+++ b/src/w32term.h     2014-07-25 11:58:36 +0000
@@ -200,6 +200,10 @@
 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);