Mercurial > hg > xemacs-beta
comparison src/menubar-msw.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 | b531bf8658e9 |
comparison
equal
deleted
inserted
replaced
1278:1706fd7322af | 1279:cd0abfdb9e9d |
---|---|
736 | 736 |
737 Lisp_Object | 737 Lisp_Object |
738 mswindows_handle_wm_initmenupopup (HMENU hmenu, struct frame *frm) | 738 mswindows_handle_wm_initmenupopup (HMENU hmenu, struct frame *frm) |
739 { | 739 { |
740 struct handle_wm_initmenu z; | 740 struct handle_wm_initmenu z; |
741 int depth = internal_bind_int (&in_menu_callback, 1); | |
742 Lisp_Object retval; | |
741 | 743 |
742 z.menu = hmenu; | 744 z.menu = hmenu; |
743 z.frame = frm; | 745 z.frame = frm; |
744 | 746 |
745 /* [[ Allow runaway filter code, e.g. custom, to be aborted. We are | 747 /* [[ Allow runaway filter code, e.g. custom, to be aborted. We are |
746 usually called from next_event_internal(), which has turned off | 748 usually called from next_event_internal(), which has turned off |
747 quit checking to read the C-g as an event.]] | 749 quit checking to read the C-g as an event.]] |
748 | 750 |
749 #### This is bogus because by the very act of calling | 751 #### This is bogus because by the very act of calling |
750 event_stream_protect_modal_loop(), we disable event retrieval! */ | 752 event_stream_protect_modal_loop(), we disable event retrieval! */ |
751 return event_stream_protect_modal_loop ("Error during menu handling", | 753 retval = event_stream_protect_modal_loop ("Error during menu handling", |
752 unsafe_handle_wm_initmenupopup, &z, | 754 unsafe_handle_wm_initmenupopup, &z, |
753 UNINHIBIT_QUIT); | 755 UNINHIBIT_QUIT); |
756 unbind_to (depth); | |
757 | |
758 return retval; | |
754 } | 759 } |
755 | 760 |
756 Lisp_Object | 761 Lisp_Object |
757 mswindows_handle_wm_initmenu (HMENU hmenu, struct frame *f) | 762 mswindows_handle_wm_initmenu (HMENU hmenu, struct frame *f) |
758 { | 763 { |