thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.0-141

Browse Source
This commit is contained in:
Bram Moolenaar 2006-10-17 14:25:24 +00:00
parent 8b402a0a87
commit 1769d5a8c9
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ex_getln.c
View File

@ -86,7 +86,7 @@ static int realloc_cmdbuff __ARGS((int len));
static void draw_cmdline __ARGS((int start, int len)); static void draw_cmdline __ARGS((int start, int len));
static void save_cmdline __ARGS((struct cmdline_info *ccp)); static void save_cmdline __ARGS((struct cmdline_info *ccp));
static void restore_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) #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
static void redrawcmd_preedit __ARGS((void)); static void redrawcmd_preedit __ARGS((void));
#endif #endif
@ -1116,7 +1116,7 @@ getcmdline(firstc, count, indent)
#endif #endif
if (c != ESC) /* use ESC to cancel inserting register */ 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 #ifdef FEAT_EVAL
/* When there was a serious error abort getting the /* When there was a serious error abort getting the
@ -1231,16 +1231,16 @@ getcmdline(firstc, count, indent)
goto cmdline_not_changed; /* Ignore mouse */ goto cmdline_not_changed; /* Ignore mouse */
# ifdef FEAT_CLIPBOARD # ifdef FEAT_CLIPBOARD
if (clip_star.available) if (clip_star.available)
cmdline_paste('*', TRUE); cmdline_paste('*', TRUE, TRUE);
else else
# endif # endif
cmdline_paste(0, TRUE); cmdline_paste(0, TRUE, TRUE);
redrawcmd(); redrawcmd();
goto cmdline_changed; goto cmdline_changed;
# ifdef FEAT_DND # ifdef FEAT_DND
case K_DROP: case K_DROP:
cmdline_paste('~', TRUE); cmdline_paste('~', TRUE, FALSE);
redrawcmd(); redrawcmd();
goto cmdline_changed; goto cmdline_changed;
# endif # endif
@ -2890,9 +2890,10 @@ restore_cmdline_alloc(p)
* return FAIL for failure, OK otherwise * return FAIL for failure, OK otherwise
*/ */
static int static int
cmdline_paste(regname, literally) cmdline_paste(regname, literally, remcr)
int regname; int regname;
int literally; /* Insert text literally instead of "as typed" */ int literally; /* Insert text literally instead of "as typed" */
int remcr; /* remove trailing CR */
{ {
long i; long i;
char_u *arg; char_u *arg;
@ -2968,7 +2969,7 @@ cmdline_paste(regname, literally)
return OK; return OK;
} }
return cmdline_paste_reg(regname, literally); return cmdline_paste_reg(regname, literally, remcr);
} }
/* /*

12
src/ops.c
View File

@ -1480,9 +1480,10 @@ get_spec_reg(regname, argp, allocated, errmsg)
* return FAIL for failure, OK otherwise * return FAIL for failure, OK otherwise
*/ */
int int
cmdline_paste_reg(regname, literally) cmdline_paste_reg(regname, literally, remcr)
int regname; int regname;
int literally; /* Insert text literally instead of "as typed" */ int literally; /* Insert text literally instead of "as typed" */
int remcr; /* don't add trailing CR */
{ {
long i; long i;
@ -1494,8 +1495,13 @@ cmdline_paste_reg(regname, literally)
{ {
cmdline_paste_str(y_current->y_array[i], literally); cmdline_paste_str(y_current->y_array[i], literally);
/* insert ^M between lines and after last line if type is MLINE */ /* Insert ^M between lines and after last line if type is MLINE.
if (y_current->y_type == MLINE || i < y_current->y_size - 1) * 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); cmdline_paste_str((char_u *)"\r", literally);
/* Check for CTRL-C, in case someone tries to paste a few thousand /* Check for CTRL-C, in case someone tries to paste a few thousand

2
src/proto/ops.pro
View File

@ -20,7 +20,7 @@ extern int do_record __ARGS((int c));
extern int do_execreg __ARGS((int regname, int colon, int addcr)); extern int do_execreg __ARGS((int regname, int colon, int addcr));
extern int insert_reg __ARGS((int regname, int literally)); 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 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 void adjust_clip_reg __ARGS((int *rp));
extern int op_delete __ARGS((oparg_T *oap)); extern int op_delete __ARGS((oparg_T *oap));
extern int op_replace __ARGS((oparg_T *oap, int c)); extern int op_replace __ARGS((oparg_T *oap, int c));

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
141,
/**/ /**/
140, 140,
/**/ /**/