diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/w32term.h | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/w32term.h b/src/w32term.h index be0b4a6f350..ace58758302 100644 --- a/src/w32term.h +++ b/src/w32term.h | |||
| @@ -750,6 +750,9 @@ extern HWND w32_system_caret_hwnd; | |||
| 750 | extern int w32_system_caret_height; | 750 | extern int w32_system_caret_height; |
| 751 | extern int w32_system_caret_x; | 751 | extern int w32_system_caret_x; |
| 752 | extern int w32_system_caret_y; | 752 | extern int w32_system_caret_y; |
| 753 | extern struct window *w32_system_caret_window; | ||
| 754 | extern int w32_system_caret_hdr_height; | ||
| 755 | extern int w32_system_caret_mode_height; | ||
| 753 | 756 | ||
| 754 | #ifdef _MSC_VER | 757 | #ifdef _MSC_VER |
| 755 | #ifndef EnumSystemLocales | 758 | #ifndef EnumSystemLocales |