diff options
| author | Gerd Moellmann | 2001-08-15 08:49:21 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-08-15 08:49:21 +0000 |
| commit | ac17f0bf879a510158017f1b611894e409af5593 (patch) | |
| tree | 1f86ae561b56ac8faac45ab86f395b6527f21235 /src | |
| parent | 8b31363957453c57c0b316fe41846f02d5855bac (diff) | |
| download | emacs-ac17f0bf879a510158017f1b611894e409af5593.tar.gz emacs-ac17f0bf879a510158017f1b611894e409af5593.zip | |
(x_update_menu_appearance): Don't call
set_frame_menubar, let the next redisplay do it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index e2ddb40244c..e0287a87609 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -4468,20 +4468,7 @@ x_update_menu_appearance (f) | |||
| 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 | ||