comparison src/ex_getln.c @ 6145:2fd550c75256 v7.4.410

updated for version 7.4.410 Problem: Fold does not open after search when there is a CmdwinLeave autocommand. Solution: Restore KeyTyped. (Jacob Niehus)
author Bram Moolenaar <bram@vim.org>
date Sun, 17 Aug 2014 17:24:07 +0200
parents ef83b423ebf7
children e754b23b7d1c
comparison
equal deleted inserted replaced
6144:5e31d6cbc6ca 6145:2fd550c75256
6361 int save_State = State; 6361 int save_State = State;
6362 int save_exmode = exmode_active; 6362 int save_exmode = exmode_active;
6363 #ifdef FEAT_RIGHTLEFT 6363 #ifdef FEAT_RIGHTLEFT
6364 int save_cmdmsg_rl = cmdmsg_rl; 6364 int save_cmdmsg_rl = cmdmsg_rl;
6365 #endif 6365 #endif
6366 #ifdef FEAT_FOLDING
6367 int save_KeyTyped;
6368 #endif
6366 6369
6367 /* Can't do this recursively. Can't do it when typing a password. */ 6370 /* Can't do this recursively. Can't do it when typing a password. */
6368 if (cmdwin_type != 0 6371 if (cmdwin_type != 0
6369 # if defined(FEAT_CRYPT) || defined(FEAT_EVAL) 6372 # if defined(FEAT_CRYPT) || defined(FEAT_EVAL)
6370 || cmdline_star > 0 6373 || cmdline_star > 0
6495 main_loop(TRUE, FALSE); 6498 main_loop(TRUE, FALSE);
6496 6499
6497 RedrawingDisabled = i; 6500 RedrawingDisabled = i;
6498 6501
6499 # ifdef FEAT_AUTOCMD 6502 # ifdef FEAT_AUTOCMD
6503
6504 # ifdef FEAT_FOLDING
6505 save_KeyTyped = KeyTyped;
6506 # endif
6507
6500 /* Trigger CmdwinLeave autocommands. */ 6508 /* Trigger CmdwinLeave autocommands. */
6501 apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf); 6509 apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf);
6510
6511 # ifdef FEAT_FOLDING
6512 /* Restore KeyTyped in case it is modified by autocommands */
6513 KeyTyped = save_KeyTyped;
6514 # endif
6515
6502 # endif 6516 # endif
6503 6517
6504 /* Restore the command line info. */ 6518 /* Restore the command line info. */
6505 ccline = save_ccline; 6519 ccline = save_ccline;
6506 cmdwin_type = 0; 6520 cmdwin_type = 0;