Merge from emacs--devo--0

[gnu-emacs] / src / w32menu.c

diff --git a/src/w32menu.c b/src/w32menu.c
index a94be08902d5cc3cae4a6d39de788903846017fc..986832b3e7c14bf42bf1afc5bd3344c4c6fd0b3d 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -34,6 +34,7 @@ Boston, MA 02110-1301, USA.  */
 #include "blockinput.h"
 #include "buffer.h"
 #include "charset.h"
+#include "character.h"
 #include "coding.h"
 
 /* This may include sys/types.h, and that somehow loses
@@ -259,10 +260,10 @@ menubar_id_to_frame (id)
   Lisp_Object tail, frame;
   FRAME_PTR f;
 
-  for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
+  for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
-      if (!GC_FRAMEP (frame))
+      if (!FRAMEP (frame))
         continue;
       f = XFRAME (frame);
       if (!FRAME_WINDOW_P (f))
@@ -2591,14 +2592,13 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_
 
 void syms_of_w32menu ()
 {
-       globals_of_w32menu ();
+  globals_of_w32menu ();
   staticpro (&menu_items);
   menu_items = Qnil;
 
   current_popup_menu = NULL;
 
-  Qdebug_on_next_call = intern ("debug-on-next-call");
-  staticpro (&Qdebug_on_next_call);
+  DEFSYM (Qdebug_on_next_call, "debug-on-next-call");
 
   defsubr (&Sx_popup_menu);
   defsubr (&Smenu_or_popup_active_p);