X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmenubar-msw.c;h=2cd701d419ac14cf6296e59dc50c950989858269;hb=b073ad3949bbab4cf51e6c5de4725bb150b3ad11;hp=eca204bce06053d43ef726dca8d105f9a49791f8;hpb=dbf2768f7b146e97e37a27316f70bb313f1acf15;p=chise%2Fxemacs-chise.git.1 diff --git a/src/menubar-msw.c b/src/menubar-msw.c index eca204b..2cd701d 100644 --- a/src/menubar-msw.c +++ b/src/menubar-msw.c @@ -678,12 +678,12 @@ prune_menubar (struct frame *f) if (menubar == NULL) return; - /* #### If a filter function has set desc to Qnil, this abort() + /* #### If a filter function has set desc to Qnil, this ABORT() triggers. To resolve, we must prevent filters explicitly from mangling with the active menu. In apply_filter probably? Is copy-tree on the whole menu too expensive? */ if (NILP (desc)) - /* abort(); */ + /* ABORT(); */ return; GCPRO1 (desc); /* just to be safe -- see above */ @@ -737,7 +737,7 @@ unsafe_handle_wm_initmenupopup_1 (HMENU menu, struct frame *f) Lisp_Object path, desc; struct gcpro gcpro1; - + /* Find which guy is going to explode */ path = Fgethash (hmenu_to_lisp_object (menu), current_hash_table, Qunbound); assert (!UNBOUNDP (path));