diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-20 18:19:52 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-20 18:19:52 +0200 |
| commit | a8fb0d0537314f717f9ab33989a5115457c9aab0 (patch) | |
| tree | 07dcacdaa266c01391a8e422c60c7b6ff9c810cf /erts/emulator/drivers | |
| parent | 00ef468474d0628903e0a3a3abc7aceb8d2c4061 (diff) | |
| parent | a49b1a844febb2740c530895b32c0bb0ae7d5aa0 (diff) | |
| download | otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.gz otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.bz2 otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.zip | |
Merge branch 'maint'
Conflicts:
erts/doc/src/erlang.xml
erts/preloaded/ebin/init.beam
lib/kernel/doc/src/os.xml
lib/stdlib/test/filename_SUITE.erl
Diffstat (limited to 'erts/emulator/drivers')
| -rw-r--r-- | erts/emulator/drivers/win32/win_con.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/drivers/win32/win_con.c b/erts/emulator/drivers/win32/win_con.c index 6b45b92cbe..5df399aa5d 100644 --- a/erts/emulator/drivers/win32/win_con.c +++ b/erts/emulator/drivers/win32/win_con.c @@ -569,7 +569,7 @@ FrameWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) return 1; case WM_SETFOCUS : CreateCaret(hClientWnd, NULL, cxChar, cyChar); - SetCaretPos(GetXFromCurrentY(GetDC(hwnd),0,cur_x), (cur_y-iVscrollPos)*cyChar); + SetCaretPos(GetXFromCurrentY(GetDC(hClientWnd),iHscrollPos,cur_x), (cur_y-iVscrollPos)*cyChar); ShowCaret(hClientWnd); return 0; case WM_KILLFOCUS: |