diff options
| author | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
| commit | 36a305a723c63fd345be65c536c52fe9765c14be (patch) | |
| tree | fb89d9e103552863214c60297a65320917109357 /src/widget.c | |
| parent | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (diff) | |
| parent | 795b1482a9e314cda32d62ac2988f573d359366e (diff) | |
| download | emacs-36a305a723c63fd345be65c536c52fe9765c14be.tar.gz emacs-36a305a723c63fd345be65c536c52fe9765c14be.zip | |
Merge from trunk
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widget.c b/src/widget.c index fd5ad167125..1f472c6231c 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -677,13 +677,13 @@ EmacsFrameDestroy (Widget widget) | |||
| 677 | if (! s) emacs_abort (); | 677 | if (! s) emacs_abort (); |
| 678 | if (! s->output_data.x) emacs_abort (); | 678 | if (! s->output_data.x) emacs_abort (); |
| 679 | 679 | ||
| 680 | BLOCK_INPUT; | 680 | block_input (); |
| 681 | x_free_gcs (s); | 681 | x_free_gcs (s); |
| 682 | if (s->output_data.x->white_relief.gc) | 682 | if (s->output_data.x->white_relief.gc) |
| 683 | XFreeGC (XtDisplay (widget), s->output_data.x->white_relief.gc); | 683 | XFreeGC (XtDisplay (widget), s->output_data.x->white_relief.gc); |
| 684 | if (s->output_data.x->black_relief.gc) | 684 | if (s->output_data.x->black_relief.gc) |
| 685 | XFreeGC (XtDisplay (widget), s->output_data.x->black_relief.gc); | 685 | XFreeGC (XtDisplay (widget), s->output_data.x->black_relief.gc); |
| 686 | UNBLOCK_INPUT; | 686 | unblock_input (); |
| 687 | } | 687 | } |
| 688 | 688 | ||
| 689 | static void | 689 | static void |