aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.0126

Browse Source
This commit is contained in:
Bram Moolenaar
2005-08-10 07:56:18 +00:00
parent 329cc7e429
commit 4f574c8ab1
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/edit.c
View File

@@ -152,7 +152,7 @@ static int cindent_on __ARGS((void));
static void ins_reg __ARGS((void)); static void ins_reg __ARGS((void));
static void ins_ctrl_g __ARGS((void)); static void ins_ctrl_g __ARGS((void));
static void ins_ctrl_hat __ARGS((void)); static void ins_ctrl_hat __ARGS((void));
static int ins_esc __ARGS((long *count, int cmdchar)); static int ins_esc __ARGS((long *count, int cmdchar, int c));
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
static void ins_ctrl_ __ARGS((void)); static void ins_ctrl_ __ARGS((void));
#endif #endif
@@ -787,7 +787,7 @@ doESCkey:
if (ins_at_eol && gchar_cursor() == NUL) if (ins_at_eol && gchar_cursor() == NUL)
o_lnum = curwin->w_cursor.lnum; o_lnum = curwin->w_cursor.lnum;
if (ins_esc(&count, cmdchar)) if (ins_esc(&count, cmdchar, c))
{ {
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
if (cmdchar != 'r' && cmdchar != 'v') if (cmdchar != 'r' && cmdchar != 'v')
@@ -6272,9 +6272,10 @@ ins_ctrl_hat()
* insert. * insert.
*/ */
static int static int
ins_esc(count, cmdchar) ins_esc(count, cmdchar, c)
long *count; long *count;
int cmdchar; int cmdchar;
int c; /* typed character */
{ {
int temp; int temp;
static int disabled_redraw = FALSE; static int disabled_redraw = FALSE;
@@ -6352,12 +6353,13 @@ ins_esc(count, cmdchar)
/* /*
* The cursor should end up on the last inserted character. * The cursor should end up on the last inserted character.
* Don't do it for CTRL-O or CTRL-L.
*/ */
if ((curwin->w_cursor.col != 0 if ((curwin->w_cursor.col != 0
#ifdef FEAT_VIRTUALEDIT #ifdef FEAT_VIRTUALEDIT
|| curwin->w_cursor.coladd > 0 || curwin->w_cursor.coladd > 0
#endif #endif
) && (restart_edit == NUL ) && ((restart_edit == NUL && c != Ctrl_L)
|| (gchar_cursor() == NUL || (gchar_cursor() == NUL
#ifdef FEAT_VISUAL #ifdef FEAT_VISUAL
&& !VIsual_active && !VIsual_active

4
src/version.h
View File

@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA" #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 8)" #define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 9)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 8, compiled " #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 9, compiled "