|
 |
81c2858 |
To: vim-dev@vim.org
|
|
|
81c2858 |
Subject: Patch 7.2.225
|
|
|
81c2858 |
Fcc: outbox
|
|
|
81c2858 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
81c2858 |
Mime-Version: 1.0
|
|
|
81c2858 |
Content-Type: text/plain; charset=UTF-8
|
|
|
81c2858 |
Content-Transfer-Encoding: 8bit
|
|
|
81c2858 |
------------
|
|
|
81c2858 |
|
|
|
81c2858 |
Patch 7.2.225
|
|
|
81c2858 |
Problem: When using ":normal" a saved character may be executed.
|
|
|
81c2858 |
Solution: Also store old_char when saving typeahead.
|
|
|
81c2858 |
Files: src/getchar.c, src/structs.h
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
*** ../vim-7.2.224/src/getchar.c 2009-02-22 23:42:08.000000000 +0100
|
|
|
81c2858 |
--- src/getchar.c 2009-07-09 18:09:13.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1309,1314 ****
|
|
|
81c2858 |
--- 1309,1317 ----
|
|
|
81c2858 |
return OK;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
+ static int old_char = -1; /* character put back by vungetc() */
|
|
|
81c2858 |
+ static int old_mod_mask; /* mod_mask for ungotten character */
|
|
|
81c2858 |
+
|
|
|
81c2858 |
#if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO)
|
|
|
81c2858 |
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1323,1328 ****
|
|
|
81c2858 |
--- 1326,1335 ----
|
|
|
81c2858 |
if (!tp->typebuf_valid)
|
|
|
81c2858 |
typebuf = tp->save_typebuf;
|
|
|
81c2858 |
|
|
|
81c2858 |
+ tp->old_char = old_char;
|
|
|
81c2858 |
+ tp->old_mod_mask = old_mod_mask;
|
|
|
81c2858 |
+ old_char = -1;
|
|
|
81c2858 |
+
|
|
|
81c2858 |
tp->save_stuffbuff = stuffbuff;
|
|
|
81c2858 |
stuffbuff.bh_first.b_next = NULL;
|
|
|
81c2858 |
# ifdef USE_INPUT_BUF
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1344,1349 ****
|
|
|
81c2858 |
--- 1351,1359 ----
|
|
|
81c2858 |
typebuf = tp->save_typebuf;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
+ old_char = tp->old_char;
|
|
|
81c2858 |
+ old_mod_mask = tp->old_mod_mask;
|
|
|
81c2858 |
+
|
|
|
81c2858 |
free_buff(&stuffbuff);
|
|
|
81c2858 |
stuffbuff = tp->save_stuffbuff;
|
|
|
81c2858 |
# ifdef USE_INPUT_BUF
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1499,1507 ****
|
|
|
81c2858 |
#define KL_PART_KEY -1 /* keylen value for incomplete key-code */
|
|
|
81c2858 |
#define KL_PART_MAP -2 /* keylen value for incomplete mapping */
|
|
|
81c2858 |
|
|
|
81c2858 |
- static int old_char = -1; /* character put back by vungetc() */
|
|
|
81c2858 |
- static int old_mod_mask; /* mod_mask for ungotten character */
|
|
|
81c2858 |
-
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Get the next input character.
|
|
|
81c2858 |
* Can return a special key or a multi-byte character.
|
|
|
81c2858 |
--- 1509,1514 ----
|
|
|
81c2858 |
*** ../vim-7.2.224/src/structs.h 2009-06-16 16:01:34.000000000 +0200
|
|
|
81c2858 |
--- src/structs.h 2009-07-09 18:09:20.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 882,887 ****
|
|
|
81c2858 |
--- 882,889 ----
|
|
|
81c2858 |
{
|
|
|
81c2858 |
typebuf_T save_typebuf;
|
|
|
81c2858 |
int typebuf_valid; /* TRUE when save_typebuf valid */
|
|
|
81c2858 |
+ int old_char;
|
|
|
81c2858 |
+ int old_mod_mask;
|
|
|
81c2858 |
struct buffheader save_stuffbuff;
|
|
|
81c2858 |
#ifdef USE_INPUT_BUF
|
|
|
81c2858 |
char_u *save_inputbuf;
|
|
|
81c2858 |
*** ../vim-7.2.224/src/version.c 2009-07-09 18:15:19.000000000 +0200
|
|
|
81c2858 |
--- src/version.c 2009-07-09 18:21:56.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 678,679 ****
|
|
|
81c2858 |
--- 678,681 ----
|
|
|
81c2858 |
{ /* Add new patch number below this line */
|
|
|
81c2858 |
+ /**/
|
|
|
81c2858 |
+ 225,
|
|
|
81c2858 |
/**/
|
|
|
81c2858 |
|
|
|
81c2858 |
--
|
|
|
81c2858 |
hundred-and-one symptoms of being an internet addict:
|
|
|
81c2858 |
78. You find yourself dialing IP numbers on the phone.
|
|
|
81c2858 |
|
|
|
81c2858 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
81c2858 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
81c2858 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
81c2858 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|