Mercurial > vim
comparison src/eval.c @ 7705:1b9a1c10806b v7.4.1151
commit https://github.com/vim/vim/commit/5f8a14b9dea094b8bbab94cfc1e8da8e633fbc01
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 21 23:34:58 2016 +0100
patch 7.4.1151
Problem: Missing change to eval.c
Solution: Also change feedkeys().
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 21 Jan 2016 23:45:06 +0100 |
parents | 20dc2763a3b9 |
children | bce3b5ddb393 |
comparison
equal
deleted
inserted
replaced
7704:38de8d8f20a7 | 7705:1b9a1c10806b |
---|---|
10958 int remap = TRUE; | 10958 int remap = TRUE; |
10959 int insert = FALSE; | 10959 int insert = FALSE; |
10960 char_u *keys, *flags; | 10960 char_u *keys, *flags; |
10961 char_u nbuf[NUMBUFLEN]; | 10961 char_u nbuf[NUMBUFLEN]; |
10962 int typed = FALSE; | 10962 int typed = FALSE; |
10963 int execute = FALSE; | |
10963 char_u *keys_esc; | 10964 char_u *keys_esc; |
10964 | 10965 |
10965 /* This is not allowed in the sandbox. If the commands would still be | 10966 /* This is not allowed in the sandbox. If the commands would still be |
10966 * executed in the sandbox it would be OK, but it probably happens later, | 10967 * executed in the sandbox it would be OK, but it probably happens later, |
10967 * when "sandbox" is no longer set. */ | 10968 * when "sandbox" is no longer set. */ |
10980 { | 10981 { |
10981 case 'n': remap = FALSE; break; | 10982 case 'n': remap = FALSE; break; |
10982 case 'm': remap = TRUE; break; | 10983 case 'm': remap = TRUE; break; |
10983 case 't': typed = TRUE; break; | 10984 case 't': typed = TRUE; break; |
10984 case 'i': insert = TRUE; break; | 10985 case 'i': insert = TRUE; break; |
10986 case 'x': execute = TRUE; break; | |
10985 } | 10987 } |
10986 } | 10988 } |
10987 } | 10989 } |
10988 | 10990 |
10989 /* Need to escape K_SPECIAL and CSI before putting the string in the | 10991 /* Need to escape K_SPECIAL and CSI before putting the string in the |
10994 ins_typebuf(keys_esc, (remap ? REMAP_YES : REMAP_NONE), | 10996 ins_typebuf(keys_esc, (remap ? REMAP_YES : REMAP_NONE), |
10995 insert ? 0 : typebuf.tb_len, !typed, FALSE); | 10997 insert ? 0 : typebuf.tb_len, !typed, FALSE); |
10996 vim_free(keys_esc); | 10998 vim_free(keys_esc); |
10997 if (vgetc_busy) | 10999 if (vgetc_busy) |
10998 typebuf_was_filled = TRUE; | 11000 typebuf_was_filled = TRUE; |
11001 if (execute) | |
11002 exec_normal(TRUE); | |
10999 } | 11003 } |
11000 } | 11004 } |
11001 } | 11005 } |
11002 | 11006 |
11003 /* | 11007 /* |