Mercurial > vim
changeset 1015:64e2b75e1615 v7.0.141
updated for version 7.0-141
| author | vimboss |
|---|---|
| date | Tue, 17 Oct 2006 14:25:24 +0000 |
| parents | 2651e7d07cd6 |
| children | 4bc81d4dc6be |
| files | src/ex_getln.c src/ops.c src/proto/ops.pro src/version.c |
| diffstat | 4 files changed, 20 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -86,7 +86,7 @@ static int realloc_cmdbuff __ARGS((int l static void draw_cmdline __ARGS((int start, int len)); static void save_cmdline __ARGS((struct cmdline_info *ccp)); static void restore_cmdline __ARGS((struct cmdline_info *ccp)); -static int cmdline_paste __ARGS((int regname, int literally)); +static int cmdline_paste __ARGS((int regname, int literally, int remcr)); #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) static void redrawcmd_preedit __ARGS((void)); #endif @@ -1116,7 +1116,7 @@ getcmdline(firstc, count, indent) #endif if (c != ESC) /* use ESC to cancel inserting register */ { - cmdline_paste(c, i == Ctrl_R); + cmdline_paste(c, i == Ctrl_R, FALSE); #ifdef FEAT_EVAL /* When there was a serious error abort getting the @@ -1231,16 +1231,16 @@ getcmdline(firstc, count, indent) goto cmdline_not_changed; /* Ignore mouse */ # ifdef FEAT_CLIPBOARD if (clip_star.available) - cmdline_paste('*', TRUE); + cmdline_paste('*', TRUE, TRUE); else # endif - cmdline_paste(0, TRUE); + cmdline_paste(0, TRUE, TRUE); redrawcmd(); goto cmdline_changed; # ifdef FEAT_DND case K_DROP: - cmdline_paste('~', TRUE); + cmdline_paste('~', TRUE, FALSE); redrawcmd(); goto cmdline_changed; # endif @@ -2890,9 +2890,10 @@ restore_cmdline_alloc(p) * return FAIL for failure, OK otherwise */ static int -cmdline_paste(regname, literally) +cmdline_paste(regname, literally, remcr) int regname; int literally; /* Insert text literally instead of "as typed" */ + int remcr; /* remove trailing CR */ { long i; char_u *arg; @@ -2968,7 +2969,7 @@ cmdline_paste(regname, literally) return OK; } - return cmdline_paste_reg(regname, literally); + return cmdline_paste_reg(regname, literally, remcr); } /*
--- a/src/ops.c +++ b/src/ops.c @@ -1480,9 +1480,10 @@ get_spec_reg(regname, argp, allocated, e * return FAIL for failure, OK otherwise */ int -cmdline_paste_reg(regname, literally) +cmdline_paste_reg(regname, literally, remcr) int regname; int literally; /* Insert text literally instead of "as typed" */ + int remcr; /* don't add trailing CR */ { long i; @@ -1494,8 +1495,13 @@ cmdline_paste_reg(regname, literally) { cmdline_paste_str(y_current->y_array[i], literally); - /* insert ^M between lines and after last line if type is MLINE */ - if (y_current->y_type == MLINE || i < y_current->y_size - 1) + /* Insert ^M between lines and after last line if type is MLINE. + * Don't do this when "remcr" is TRUE and the next line is empty. */ + if (y_current->y_type == MLINE + || (i < y_current->y_size - 1 + && !(remcr + && i == y_current->y_size - 2 + && *y_current->y_array[i + 1] == NUL))) cmdline_paste_str((char_u *)"\r", literally); /* Check for CTRL-C, in case someone tries to paste a few thousand
--- a/src/proto/ops.pro +++ b/src/proto/ops.pro @@ -20,7 +20,7 @@ extern int do_record __ARGS((int c)); extern int do_execreg __ARGS((int regname, int colon, int addcr)); extern int insert_reg __ARGS((int regname, int literally)); extern int get_spec_reg __ARGS((int regname, char_u **argp, int *allocated, int errmsg)); -extern int cmdline_paste_reg __ARGS((int regname, int literally)); +extern int cmdline_paste_reg __ARGS((int regname, int literally, int remcr)); extern void adjust_clip_reg __ARGS((int *rp)); extern int op_delete __ARGS((oparg_T *oap)); extern int op_replace __ARGS((oparg_T *oap, int c));