Mercurial > vim
comparison src/os_mswin.c @ 13244:ac42c4b11dbc v8.0.1496
patch 8.0.1496: clearing a pointer takes two lines
commit https://github.com/vim/vim/commit/d23a823669d93fb2a570a039173eefe4856ac806
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 10 18:45:26 2018 +0100
patch 8.0.1496: clearing a pointer takes two lines
Problem: Clearing a pointer takes two lines.
Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi,
closes #2629)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 10 Feb 2018 19:00:07 +0100 |
parents | ee070a5eb3a0 |
children | 69517d67421f |
comparison
equal
deleted
inserted
replaced
13243:899b19739188 | 13244:ac42c4b11dbc |
---|---|
1231 #endif | 1231 #endif |
1232 SetWindowText(hDlg, (LPCSTR)szAppName); | 1232 SetWindowText(hDlg, (LPCSTR)szAppName); |
1233 if (prt_name != NULL) | 1233 if (prt_name != NULL) |
1234 { | 1234 { |
1235 vimSetDlgItemText(hDlg, IDC_PRINTTEXT2, (char_u *)prt_name); | 1235 vimSetDlgItemText(hDlg, IDC_PRINTTEXT2, (char_u *)prt_name); |
1236 vim_free(prt_name); | 1236 VIM_CLEAR(prt_name); |
1237 prt_name = NULL; | |
1238 } | 1237 } |
1239 EnableMenuItem(GetSystemMenu(hDlg, FALSE), SC_CLOSE, MF_GRAYED); | 1238 EnableMenuItem(GetSystemMenu(hDlg, FALSE), SC_CLOSE, MF_GRAYED); |
1240 #ifndef FEAT_GUI | 1239 #ifndef FEAT_GUI |
1241 BringWindowToTop(s_hwnd); | 1240 BringWindowToTop(s_hwnd); |
1242 #endif | 1241 #endif |
2606 | 2605 |
2607 /* Loop until we receive a reply */ | 2606 /* Loop until we receive a reply */ |
2608 while (reply_received == 0) | 2607 while (reply_received == 0) |
2609 { | 2608 { |
2610 #ifdef FEAT_TIMERS | 2609 #ifdef FEAT_TIMERS |
2610 /* TODO: use the return value to decide how long to wait. */ | |
2611 check_due_timer(); | 2611 check_due_timer(); |
2612 #endif | 2612 #endif |
2613 time(&now); | 2613 time(&now); |
2614 if (timeout > 0 && (now - start) >= timeout) | 2614 if (timeout > 0 && (now - start) >= timeout) |
2615 break; | 2615 break; |