Mercurial > vim

comparison src/digraph.c @ 1389:bdcfe793d49f v7.1.104

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-104
author vimboss
date Thu, 13 Sep 2007 16:26:47 +0000
parents e70c0d863e0c
children fa07532e69c6
comparison
equal deleted inserted replaced
1388:26cbd39f2251 1389:bdcfe793d49f
2026 { 2026 {
2027 int c, cc; 2027 int c, cc;
2028 2028
2029 ++no_mapping; 2029 ++no_mapping;
2030 ++allow_keys; 2030 ++allow_keys;
2031 c = safe_vgetc(); 2031 c = plain_vgetc();
2032 --no_mapping; 2032 --no_mapping;
2033 --allow_keys; 2033 --allow_keys;
2034 if (c != ESC) /* ESC cancels CTRL-K */ 2034 if (c != ESC) /* ESC cancels CTRL-K */
2035 { 2035 {
2036 if (IS_SPECIAL(c)) /* insert special key code */ 2036 if (IS_SPECIAL(c)) /* insert special key code */
2048 else 2048 else
2049 add_to_showcmd(c); 2049 add_to_showcmd(c);
2050 #endif 2050 #endif
2051 ++no_mapping; 2051 ++no_mapping;
2052 ++allow_keys; 2052 ++allow_keys;
2053 cc = safe_vgetc(); 2053 cc = plain_vgetc();
2054 --no_mapping; 2054 --no_mapping;
2055 --allow_keys; 2055 --allow_keys;
2056 if (cc != ESC) /* ESC cancels CTRL-K */ 2056 if (cc != ESC) /* ESC cancels CTRL-K */
2057 return getdigraph(c, cc, TRUE); 2057 return getdigraph(c, cc, TRUE);
2058 } 2058 }
2348 curbuf->b_kmap_state &= ~KEYMAP_INIT; 2348 curbuf->b_kmap_state &= ~KEYMAP_INIT;
2349 2349
2350 if (*curbuf->b_p_keymap == NUL) 2350 if (*curbuf->b_p_keymap == NUL)
2351 { 2351 {
2352 /* Stop any active keymap and clear the table. Also remove 2352 /* Stop any active keymap and clear the table. Also remove
2353 * b:keymap_unload, as no keymap is active now. */ 2353 * b:keymap_name, as no keymap is active now. */
2354 keymap_unload(); 2354 keymap_unload();
2355 do_cmdline_cmd((char_u *)"unlet! b:keymap_name"); 2355 do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
2356 } 2356 }
2357 else 2357 else
2358 { 2358 {