comparison 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
comparison
equal deleted inserted replaced
109350:c11d07f3d731 109351:c8a969d13eda
1062 instance by clicking the mouse away from a valid choice or by typing 1062 instance by clicking the mouse away from a valid choice or by typing
1063 keyboard input, then this normally results in a quit and 1063 keyboard input, then this normally results in a quit and
1064 `x-popup-menu' does not return. But if POSITION is a mouse button 1064 `x-popup-menu' does not return. But if POSITION is a mouse button
1065 event (indicating that the user invoked the menu with the mouse) then 1065 event (indicating that the user invoked the menu with the mouse) then
1066 no quit occurs and `x-popup-menu' returns nil. */) 1066 no quit occurs and `x-popup-menu' returns nil. */)
1067 (position, menu) 1067 (Lisp_Object position, Lisp_Object menu)
1068 Lisp_Object position, menu;
1069 { 1068 {
1070 Lisp_Object keymap, tem; 1069 Lisp_Object keymap, tem;
1071 int xpos = 0, ypos = 0; 1070 int xpos = 0, ypos = 0;
1072 Lisp_Object title; 1071 Lisp_Object title;
1073 char *error_name = NULL; 1072 char *error_name = NULL;