comparison src/gui-x.c @ 1914:d1312c7bdfab

[xemacs-hg @ 2004-02-17 15:22:09 by james] Evaluate safely when in redisplay.
author james
date Tue, 17 Feb 2004 15:22:09 +0000
parents a8d8f419b459
children 95fee4a1420e
comparison
equal deleted inserted replaced
1913:7473844a83d3 1914:d1312c7bdfab
316 enqueue_magic_eval_event (update_widget_instances, frame); 316 enqueue_magic_eval_event (update_widget_instances, frame);
317 } 317 }
318 318
319 #if 1 319 #if 1
320 /* Eval the activep slot of the menu item */ 320 /* Eval the activep slot of the menu item */
321 # define wv_set_evalable_slot(slot,form) do { \ 321 # define wv_set_evalable_slot(slot,form) do { \
322 Lisp_Object wses_form = (form); \ 322 Lisp_Object wses_form = (form); \
323 (slot) = (NILP (wses_form) ? 0 : \ 323 (slot) = (NILP (wses_form) ? 0 : \
324 EQ (wses_form, Qt) ? 1 : \ 324 EQ (wses_form, Qt) ? 1 : \
325 !NILP (Feval (wses_form))); \ 325 !NILP (in_display ? eval_within_redisplay (wses_form) \
326 : Feval (wses_form))); \
326 } while (0) 327 } while (0)
327 #else 328 #else
328 /* Treat the activep slot of the menu item as a boolean */ 329 /* Treat the activep slot of the menu item as a boolean */
329 # define wv_set_evalable_slot(slot,form) \ 330 # define wv_set_evalable_slot(slot,form) \
330 ((void) (slot = (!NILP (form)))) 331 ((void) (slot = (!NILP (form))))