diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-05-15 19:33:18 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-05-15 19:33:18 +0000 |
| commit | 78a1531005adc6bfe435ee2b9207864688bea7e9 (patch) | |
| tree | c0f3a65c5bc4a285124b518dabb080c311968ea3 /src/normal.c | |
| parent | 0c094b9d7f8a031e2cb495551ecc13e34cfa5818 (diff) | |
updated for version 7.2-174v7.2.174
Diffstat (limited to 'src/normal.c')
| -rw-r--r-- | src/normal.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/normal.c b/src/normal.c index 326995e6d8..9057b780a7 100644 --- a/src/normal.c +++ b/src/normal.c @@ -493,14 +493,14 @@ init_normal_cmds() int i; /* Fill the index table with a one to one relation. */ - for (i = 0; i < NV_CMDS_SIZE; ++i) + for (i = 0; i < (int)NV_CMDS_SIZE; ++i) nv_cmd_idx[i] = i; /* Sort the commands by the command character. */ qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare); /* Find the first entry that can't be indexed by the command character. */ - for (i = 0; i < NV_CMDS_SIZE; ++i) + for (i = 0; i < (int)NV_CMDS_SIZE; ++i) if (i != nv_cmds[nv_cmd_idx[i]].cmd_char) break; nv_max_linear = i - 1; @@ -561,11 +561,10 @@ find_command(cmdchar) /* * Execute a command in Normal mode. */ -/*ARGSUSED*/ void normal_cmd(oap, toplevel) oparg_T *oap; - int toplevel; /* TRUE when called from main() */ + int toplevel UNUSED; /* TRUE when called from main() */ { cmdarg_T ca; /* command arguments */ int c; @@ -2188,10 +2187,9 @@ op_colon(oap) /* * Handle the "g@" operator: call 'operatorfunc'. */ -/*ARGSUSED*/ static void op_function(oap) - oparg_T *oap; + oparg_T *oap UNUSED; { #ifdef FEAT_EVAL char_u *(argv[1]); @@ -4100,10 +4098,9 @@ nv_ignore(cap) * Command character that doesn't do anything, but unlike nv_ignore() does * start edit(). Used for "startinsert" executed while starting up. */ -/*ARGSUSED */ static void nv_nop(cap) - cmdarg_T *cap; + cmdarg_T *cap UNUSED; { } @@ -5241,7 +5238,7 @@ nv_colon(cap) if (cap->oap->op_type != OP_NOP && (cap->oap->start.lnum > curbuf->b_ml.ml_line_count || cap->oap->start.col > - STRLEN(ml_get(cap->oap->start.lnum)))) + (colnr_T)STRLEN(ml_get(cap->oap->start.lnum)))) clearopbeep(cap->oap); } } @@ -5816,7 +5813,10 @@ nv_right(cap) for (n = cap->count1; n > 0; --n) { if ((!PAST_LINE && oneright() == FAIL) - || (PAST_LINE && *ml_get_cursor() == NUL)) +#ifdef FEAT_VISUAL + || (PAST_LINE && *ml_get_cursor() == NUL) +#endif + ) { /* * <Space> wraps to next line if 'whichwrap' has 's'. |