Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / oldXMenu / Activate.c

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 42eb33d..8f1b548 100644 (file)
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  *                     3)      The application has enabled asynchronous event
  *                             queuing mode.  In this mode all foreign events
- *                             will be queued up untill XMenuActivate
+ *                             will be queued up until XMenuActivate
  *                             terminates; at which time they will be
  *                             returned to the X event queue.  As long as
  *                             AEQ mode is enabled any asynchronous event
@@ -95,7 +95,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 #include <X11/keysym.h>
 
@@ -122,7 +121,7 @@ XMenuActivate(
     int y_pos,                         /* Y coordinate of menu position. */
     unsigned int event_mask,           /* Mouse button event mask. */
     char **data,                       /* Pointer to return data value. */
-    void (* help_callback) (char *, int, int)) /* Help callback.  */
+    void (*help_callback) (char const *, int, int)) /* Help callback.  */
 {
     int status;                                /* X routine call status. */
     int orig_x;                                /* Upper left menu origin X coord. */