diff src/menu.c @ 109351:c8a969d13eda

merge trunk
author Kenichi Handa <handa@etlken>
date Fri, 09 Jul 2010 15:55:27 +0900
parents 8cfee7d2955f
children bf6283e6c0a3
line wrap: on
line diff
--- a/src/menu.c	Thu Jul 08 17:09:35 2010 +0900
+++ b/src/menu.c	Fri Jul 09 15:55:27 2010 +0900
@@ -1064,8 +1064,7 @@
 `x-popup-menu' does not return.  But if POSITION is a mouse button
 event (indicating that the user invoked the menu with the mouse) then
 no quit occurs and `x-popup-menu' returns nil.  */)
-  (position, menu)
-     Lisp_Object position, menu;
+  (Lisp_Object position, Lisp_Object menu)
 {
   Lisp_Object keymap, tem;
   int xpos = 0, ypos = 0;