Mercurial > vim

comparison src/misc1.c @ 7582:e0acbccdf1fc v7.4.1091

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 15 15:17:04 2016 +0100 patch 7.4.1091 Problem: When making a change while need_wait_return is set there is a two second delay. Solution: Do not assume the ATTENTION prompt was given when need_wait_return was set already.
author Christian Brabandt <cb@256bit.org>
date Fri, 15 Jan 2016 15:45:05 +0100
parents 1886f2863437
children 2a280b8e7040
comparison
equal deleted inserted replaced
7581:cb47c1dcfcd3 7582:e0acbccdf1fc
2776 #ifdef FEAT_QUICKFIX 2776 #ifdef FEAT_QUICKFIX
2777 && !bt_dontwrite(curbuf) 2777 && !bt_dontwrite(curbuf)
2778 #endif 2778 #endif
2779 ) 2779 )
2780 { 2780 {
2781 int save_need_wait_return = need_wait_return;
2782
2783 need_wait_return = FALSE;
2781 ml_open_file(curbuf); 2784 ml_open_file(curbuf);
2782 2785
2783 /* The ml_open_file() can cause an ATTENTION message. 2786 /* The ml_open_file() can cause an ATTENTION message.
2784 * Wait two seconds, to make sure the user reads this unexpected 2787 * Wait two seconds, to make sure the user reads this unexpected
2785 * message. Since we could be anywhere, call wait_return() now, 2788 * message. Since we could be anywhere, call wait_return() now,
2789 out_flush(); 2792 out_flush();
2790 ui_delay(2000L, TRUE); 2793 ui_delay(2000L, TRUE);
2791 wait_return(TRUE); 2794 wait_return(TRUE);
2792 msg_scroll = save_msg_scroll; 2795 msg_scroll = save_msg_scroll;
2793 } 2796 }
2797 else
2798 need_wait_return = save_need_wait_return;
2794 } 2799 }
2795 changed_int(); 2800 changed_int();
2796 } 2801 }
2797 ++curbuf->b_changedtick; 2802 ++curbuf->b_changedtick;
2798 } 2803 }