[Emacs-diffs] Changes to emacs/src/xmenu.c

[Andreas Schwab]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.245 emacs/src/xmenu.c:1.246
*** emacs/src/xmenu.c:1.245     Sat May  3 21:27:32 2003
--- emacs/src/xmenu.c   Sat May 10 12:14:35 2003
***************
*** 1,5 ****
  /* X Communication module for terminals which understand the X protocol.
!    Copyright (C) 1986, 88, 93, 94, 96, 99, 2000, 2001
     Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
--- 1,5 ----
  /* X Communication module for terminals which understand the X protocol.
!    Copyright (C) 1986, 88, 93, 94, 96, 99, 2000, 2001, 2003
     Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
***************
*** 417,423 ****
    };
  
  static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
!                                 struct skp*));
  
  /* This is a recursive subroutine of keymap_panes.
     It handles one keymap, KEYMAP.
--- 417,423 ----
    };
  
  static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
!                                 void *));
  
  /* This is a recursive subroutine of keymap_panes.
     It handles one keymap, KEYMAP.
***************
*** 489,501 ****
     not.  */
  
  static void
! single_menu_item (key, item, dummy, skp)
       Lisp_Object key, item, dummy;
!      struct skp *skp;
  {
    Lisp_Object map, item_string, enabled;
    struct gcpro gcpro1, gcpro2;
    int res;
  
    /* Parse the menu item and leave the result in item_properties.  */
    GCPRO2 (key, item);
--- 489,502 ----
     not.  */
  
  static void
! single_menu_item (key, item, dummy, skp_v)
       Lisp_Object key, item, dummy;
!      void *skp_v;
  {
    Lisp_Object map, item_string, enabled;
    struct gcpro gcpro1, gcpro2;
    int res;
+   struct skp *skp = skp_v;
  
    /* Parse the menu item and leave the result in item_properties.  */
    GCPRO2 (key, item);