diff options
| author | Jan Djärv | 2005-02-07 21:31:28 +0000 |
|---|---|---|
| committer | Jan Djärv | 2005-02-07 21:31:28 +0000 |
| commit | caacfeb891addc51922527d6d83f5e558659fa40 (patch) | |
| tree | 6c6c56545f3d60d21beb9a69508d5cfcc536d2ff /src | |
| parent | 009bb5d21902505f197bf6fc9c5bca7dab23a4ba (diff) | |
| download | emacs-caacfeb891addc51922527d6d83f5e558659fa40.tar.gz emacs-caacfeb891addc51922527d6d83f5e558659fa40.zip | |
(x_set_tool_bar_lines): Check that width and height is greater than
zero before clearing area.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/xfns.c b/src/xfns.c index bf1b0273a0f..c126d6ad361 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1398,10 +1398,14 @@ x_set_tool_bar_lines (f, value, oldval) | |||
| 1398 | int width = FRAME_PIXEL_WIDTH (f); | 1398 | int width = FRAME_PIXEL_WIDTH (f); |
| 1399 | int y = nlines * FRAME_LINE_HEIGHT (f); | 1399 | int y = nlines * FRAME_LINE_HEIGHT (f); |
| 1400 | 1400 | ||
| 1401 | BLOCK_INPUT; | 1401 | /* height can be zero here. */ |
| 1402 | x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 1402 | if (height > 0 && width > 0) |
| 1403 | 0, y, width, height, False); | 1403 | { |
| 1404 | UNBLOCK_INPUT; | 1404 | BLOCK_INPUT; |
| 1405 | x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | ||
| 1406 | 0, y, width, height, False); | ||
| 1407 | UNBLOCK_INPUT; | ||
| 1408 | } | ||
| 1405 | 1409 | ||
| 1406 | if (WINDOWP (f->tool_bar_window)) | 1410 | if (WINDOWP (f->tool_bar_window)) |
| 1407 | clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); | 1411 | clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |