Mercurial > emacs
comparison src/xfaces.c @ 38818:b0327e4e1da7
(x_update_menu_appearance): Don't call
set_frame_menubar, let the next redisplay do it.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Wed, 15 Aug 2001 08:49:21 +0000 |
parents | 7ca6f1c8e014 |
children | 70ef1eb656a6 |
comparison
equal
deleted
inserted
replaced
38817:c37b78f1a5db | 38818:b0327e4e1da7 |
---|---|
4466 XrmPutLineResource (&rdb, line); | 4466 XrmPutLineResource (&rdb, line); |
4467 changed_p = 1; | 4467 changed_p = 1; |
4468 } | 4468 } |
4469 | 4469 |
4470 if (changed_p && f->output_data.x->menubar_widget) | 4470 if (changed_p && f->output_data.x->menubar_widget) |
4471 { | 4471 free_frame_menubar (f); |
4472 int blocked; | |
4473 | |
4474 /* Function set_frame_menubar may call Lisp, for example | |
4475 from menu_item_eval_property inside a condition-case. If | |
4476 that code signals an error, Fsignal totally unblocks | |
4477 input, and if this function is called inside a | |
4478 BLOCK/UNBLOCK_INPUT which it is, this will screw up the | |
4479 interrupt_input_blocked count, unless we save it... */ | |
4480 blocked = interrupt_input_blocked; | |
4481 free_frame_menubar (f); | |
4482 set_frame_menubar (f, 1, 1); | |
4483 interrupt_input_blocked = blocked; | |
4484 } | |
4485 } | 4472 } |
4486 } | 4473 } |
4487 | 4474 |
4488 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ | 4475 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */ |
4489 | 4476 |