aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorBastien2017-07-03 09:06:29 +0200
committerBastien2017-07-03 09:06:29 +0200
commit5ca1888fe670aee7febd4d42665d7372ab2ffebc (patch)
tree1f7f8d8a7580e556fc83cf3a6aaeec567b33a090 /src/xterm.c
parent20e006ffee41062f1b551a92c24d9edc53cd0f56 (diff)
parent1b4f0a92ff3505ef9a465b9b391756e3a73a6443 (diff)
downloademacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.tar.gz
emacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.zip
Merge branch 'master' into scratch/org-mode-merge
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index c8836b7ca78..a214cd81031 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11757,6 +11757,22 @@ x_free_frame_resources (struct frame *f)
11757 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->horizontal_drag_cursor); 11757 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->horizontal_drag_cursor);
11758 if (f->output_data.x->vertical_drag_cursor != 0) 11758 if (f->output_data.x->vertical_drag_cursor != 0)
11759 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->vertical_drag_cursor); 11759 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->vertical_drag_cursor);
11760 if (f->output_data.x->left_edge_cursor != 0)
11761 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->left_edge_cursor);
11762 if (f->output_data.x->top_left_corner_cursor != 0)
11763 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->top_left_corner_cursor);
11764 if (f->output_data.x->top_edge_cursor != 0)
11765 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->top_edge_cursor);
11766 if (f->output_data.x->top_right_corner_cursor != 0)
11767 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->top_right_corner_cursor);
11768 if (f->output_data.x->right_edge_cursor != 0)
11769 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->right_edge_cursor);
11770 if (f->output_data.x->bottom_right_corner_cursor != 0)
11771 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->bottom_right_corner_cursor);
11772 if (f->output_data.x->bottom_edge_cursor != 0)
11773 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->bottom_edge_cursor);
11774 if (f->output_data.x->bottom_left_corner_cursor != 0)
11775 XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->bottom_left_corner_cursor);
11760 11776
11761 XFlush (FRAME_X_DISPLAY (f)); 11777 XFlush (FRAME_X_DISPLAY (f));
11762 } 11778 }