diff options
| author | Bastien | 2017-07-03 09:06:29 +0200 |
|---|---|---|
| committer | Bastien | 2017-07-03 09:06:29 +0200 |
| commit | 5ca1888fe670aee7febd4d42665d7372ab2ffebc (patch) | |
| tree | 1f7f8d8a7580e556fc83cf3a6aaeec567b33a090 /src/xterm.h | |
| parent | 20e006ffee41062f1b551a92c24d9edc53cd0f56 (diff) | |
| parent | 1b4f0a92ff3505ef9a465b9b391756e3a73a6443 (diff) | |
| download | emacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.tar.gz emacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.zip | |
Merge branch 'master' into scratch/org-mode-merge
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h index a75257006fd..803feda99f3 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -637,6 +637,14 @@ struct x_output | |||
| 637 | Cursor horizontal_drag_cursor; | 637 | Cursor horizontal_drag_cursor; |
| 638 | Cursor vertical_drag_cursor; | 638 | Cursor vertical_drag_cursor; |
| 639 | Cursor current_cursor; | 639 | Cursor current_cursor; |
| 640 | Cursor left_edge_cursor; | ||
| 641 | Cursor top_left_corner_cursor; | ||
| 642 | Cursor top_edge_cursor; | ||
| 643 | Cursor top_right_corner_cursor; | ||
| 644 | Cursor right_edge_cursor; | ||
| 645 | Cursor bottom_right_corner_cursor; | ||
| 646 | Cursor bottom_edge_cursor; | ||
| 647 | Cursor bottom_left_corner_cursor; | ||
| 640 | 648 | ||
| 641 | /* Window whose cursor is hourglass_cursor. This window is temporarily | 649 | /* Window whose cursor is hourglass_cursor. This window is temporarily |
| 642 | mapped to display an hourglass cursor. */ | 650 | mapped to display an hourglass cursor. */ |