Mercurial > hg > xemacs-beta
comparison src/menubar-x.c @ 1279:cd0abfdb9e9d
[xemacs-hg @ 2003-02-09 09:33:42 by ben]
walk-windows, redisplay fixes
console-stream.c: Abort when any attempts to output a stream console are made.
Should be caught sooner.
event-msw.c: Don't redisplay() during sizing when the frame has not yet been
initialized completely.
event-stream.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h: Restore in_menu_callback. Bind it in menubar-{msw,x}.c when
calling filter functions and the like. Conditionalize on it, not
in_modal_loop, when issuing error in `next-event', otherwise we
bite the dust immediately -- event-msw.c purposely calls
Fnext_event() in a modal loop, and knows what it's doing.
redisplay-output.c: Formatting fixes.
redisplay.c, window.c, winslots.h: Delete lots of carcasses of attempts to add redisplay support for
font-lock -- `pre/post-redisplay-hook', unimplemented junk from
FSF (redisplay-end-trigger, `window-scroll-functions',
`window-size-change-functions'). If we want to port some
redisplay support from FSF, port the `fontified' property.
redisplay.c: Put in a check here (as well as redisplay_device()) for a stream
frame. We can get here directly through Lisp fun
`redisplay-frame'. Abort if frame not initialized.
redisplay.c: Check for stream frames/devices.
window.el: walk-windows was broken when a frame was given to WHICH-FRAMES.
it would loop forever. The FSF version fixes this but i didn't
sync to them because (a) it conses (bad for lazy-lock), (b) it
calls select-window.
author | ben |
---|---|
date | Sun, 09 Feb 2003 09:33:48 +0000 |
parents | fffe735e63ee |
children | 1b0339b048ce |
comparison
equal
deleted
inserted
replaced
1278:1706fd7322af | 1279:cd0abfdb9e9d |
---|---|
387 protected_menu_item_descriptor_to_widget_value (Lisp_Object desc, | 387 protected_menu_item_descriptor_to_widget_value (Lisp_Object desc, |
388 int menu_type, int deep_p, | 388 int menu_type, int deep_p, |
389 int filter_p) | 389 int filter_p) |
390 { | 390 { |
391 struct menu_item_descriptor_to_widget_value midtwv; | 391 struct menu_item_descriptor_to_widget_value midtwv; |
392 int depth = internal_bind_int (&in_menu_callback, 1); | |
393 Lisp_Object retval; | |
392 | 394 |
393 midtwv.desc = desc; | 395 midtwv.desc = desc; |
394 midtwv.menu_type = menu_type; | 396 midtwv.menu_type = menu_type; |
395 midtwv.deep_p = deep_p; | 397 midtwv.deep_p = deep_p; |
396 midtwv.filter_p = filter_p; | 398 midtwv.filter_p = filter_p; |
397 | 399 |
398 if (UNBOUNDP | 400 retval = event_stream_protect_modal_loop |
399 (event_stream_protect_modal_loop | 401 ("Error during menu callback", |
400 ("Error during menu callback", | 402 protected_menu_item_descriptor_to_widget_value_1, &midtwv, |
401 protected_menu_item_descriptor_to_widget_value_1, &midtwv, | 403 UNINHIBIT_QUIT); |
402 UNINHIBIT_QUIT))) | 404 unbind_to (depth); |
405 | |
406 if (UNBOUNDP (retval)) | |
403 return 0; | 407 return 0; |
404 | 408 |
405 return midtwv.wv; | 409 return midtwv.wv; |
406 } | 410 } |
407 | 411 |