diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-06-01 23:23:50 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-06-01 23:23:50 +0000 |
| commit | ed662bdd5dd454f49b82fbfe371c3e7b4867a8ff (patch) | |
| tree | 9fec5729bb13cf8e61d0048c1f15edef33092d5a | |
| parent | 80280bb74aca5d58e6745731c05d825eedd9790f (diff) | |
| download | emacs-ed662bdd5dd454f49b82fbfe371c3e7b4867a8ff.tar.gz | |
(x_destroy_bitmap): Block and unblock input.
(Fx_horizontal_line): Add one UNBLOCK_INPUT to fix a misbalance,
and move another one to include the call to XFreeGC, in case we
someday remove the "#if 0" conditions.
| -rw-r--r-- | src/xfns.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index 8ddd363d358..aedd45c07ca 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -570,12 +570,14 @@ x_destroy_bitmap (f, id) --dpyinfo->bitmaps[id - 1].refcount; if (dpyinfo->bitmaps[id - 1].refcount == 0) { + BLOCK_INPUT; XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].pixmap); if (dpyinfo->bitmaps[id - 1].file) { free (dpyinfo->bitmaps[id - 1].file); dpyinfo->bitmaps[id - 1].file = NULL; } + UNBLOCK_INPUT; } } } @@ -4105,6 +4107,7 @@ DEFUN ("x-horizontal-line", Fx_horizontal_line, Sx_horizontal_line, 1, 1, "e", | GCLineWidth | GCForeground | GCBackground, &gc_values); XSetDashes (FRAME_X_DISPLAY (f), erase_gc, 0, dash_list, dashes); + UNBLOCK_INPUT; #endif while (1) @@ -4133,12 +4136,12 @@ DEFUN ("x-horizontal-line", Fx_horizontal_line, Sx_horizontal_line, 1, 1, "e", BLOCK_INPUT; XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), erase_gc, left, line, right, line); - UNBLOCK_INPUT; unread_command_event = obj; #if 0 XFreeGC (FRAME_X_DISPLAY (f), line_gc); XFreeGC (FRAME_X_DISPLAY (f), erase_gc); #endif + UNBLOCK_INPUT; return Qnil; } } |