Mercurial > hg > xemacs-beta

comparison src/menubar-x.c @ 219:262b8bb4a523 r20-4b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b8
author cvs
date Mon, 13 Aug 2007 10:09:35 +0200
parents d44af0c54775
children 557eaa0339bf
comparison
equal deleted inserted replaced
218:c9f226976f56 219:262b8bb4a523
190 wv = NULL; 190 wv = NULL;
191 goto menu_item_done; 191 goto menu_item_done;
192 } 192 }
193 if (!NILP (hook_fn)) 193 if (!NILP (hook_fn))
194 { 194 {
195 #ifdef LWLIB_MENUBARS_LUCID 195 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF
196 if (filter_p || depth == 0) 196 if (filter_p || depth == 0)
197 { 197 {
198 #endif 198 #endif
199 desc = call1_trapping_errors ("Error in menubar filter", 199 desc = call1_trapping_errors ("Error in menubar filter",
200 hook_fn, desc); 200 hook_fn, desc);
201 if (UNBOUNDP (desc)) 201 if (UNBOUNDP (desc))
202 desc = Qnil; 202 desc = Qnil;
203 #ifdef LWLIB_MENUBARS_LUCID 203 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF
204 } 204 }
205 else 205 else
206 { 206 {
207 widget_value *incr_wv = xmalloc_widget_value (); 207 widget_value *incr_wv = xmalloc_widget_value ();
208 wv->contents = incr_wv; 208 wv->contents = incr_wv;
319 unbind_to (count, Qnil); 319 unbind_to (count, Qnil);
320 return wv; 320 return wv;
321 } 321 }
322 322
323 323
324 #ifdef LWLIB_MENUBARS_LUCID 324 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF
325 int in_menu_callback; 325 int in_menu_callback;
326 326
327 static Lisp_Object 327 static Lisp_Object
328 restore_in_menu_callback (Lisp_Object val) 328 restore_in_menu_callback (Lisp_Object val)
329 { 329 {