Skip to content

Commit e8a178c

Browse files
genomagenoma
committed
Merge branch 'vim'
2 parents 415c058 + 0b70ba0 commit e8a178c

25 files changed

+212
-45
lines changed

‎.hgtags

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3352,3 +3352,14 @@ f8f2a61e538d4094e29db47954516d572b2dcca4 v7-4-624
33523352
c77ef1bf9623d0c7ebd7e011e6ce7a3a12b0bf41 v7-4-627
33533353
6eecaf5a18ca95f0ff06dc2ac88015e6bb6f70ac v7-4-628
33543354
f28c171348fbfe055c86a354b4d235e2786215d9 v7-4-629
3355+
a5ba0921efcb7d48a9ad5939f66953a43ddf359b v7-4-630
3356+
86f00f7678eb312cb88b25da2df648f9c9199b5c v7-4-631
3357+
cd7b5bbe49525c716f2b7eba4353b1f496134944 v7-4-632
3358+
03688be95994f55e68cce333a92b673ff31dda9c v7-4-633
3359+
290631797b76d126b51b83f04bce6218f0ed2dac v7-4-634
3360+
a871b5070d59ef9ed1934b2951ef896b2c71b444 v7-4-635
3361+
578c16fbab6684cf2c690f78089f755f041568b3 v7-4-636
3362+
a532340f39406fa50e8db45f769468bdeff1e982 v7-4-637
3363+
199ce895e1629df83ef97d62ca70d38b7400adad v7-4-638
3364+
43f444efe6a2de86f459e9dc164429a8d81c70e7 v7-4-639
3365+
34774748534375073253c4a683d0d3d8944494db v7-4-640

‎src/edit.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8857,7 +8857,7 @@ ins_bs(c, mode, inserted_space_p)
88578857
*/
88588858
if (curwin->w_cursor.col == 0)
88598859
{
8860-
lnum = Insstart_orig.lnum;
8860+
lnum = Insstart.lnum;
88618861
if (curwin->w_cursor.lnum == lnum
88628862
#ifdef FEAT_RIGHTLEFT
88638863
|| revins_on
@@ -8867,9 +8867,8 @@ ins_bs(c, mode, inserted_space_p)
88678867
if (u_save((linenr_T)(curwin->w_cursor.lnum - 2),
88688868
(linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL)
88698869
return FALSE;
8870-
--Insstart_orig.lnum;
8871-
Insstart_orig.col = MAXCOL;
8872-
Insstart = Insstart_orig;
8870+
--Insstart.lnum;
8871+
Insstart.col = MAXCOL;
88738872
}
88748873
/*
88758874
* In replace mode:

‎src/eval.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8694,13 +8694,19 @@ call_func(funcname, len, rettv, argcount, argvars, firstline, lastline,
86948694
error = ERROR_DICT;
86958695
else
86968696
{
8697+
int did_save_redo = FALSE;
8698+
86978699
/*
86988700
* Call the user function.
86998701
* Save and restore search patterns, script variables and
87008702
* redo buffer.
87018703
*/
87028704
save_search_patterns();
8703-
saveRedobuff();
8705+
if (!ins_compl_active())
8706+
{
8707+
saveRedobuff();
8708+
did_save_redo = TRUE;
8709+
}
87048710
++fp->uf_calls;
87058711
call_user_func(fp, argcount, argvars, rettv,
87068712
firstline, lastline,
@@ -8710,7 +8716,8 @@ call_func(funcname, len, rettv, argcount, argvars, firstline, lastline,
87108716
/* Function was unreferenced while being used, free it
87118717
* now. */
87128718
func_free(fp);
8713-
restoreRedobuff();
8719+
if (did_save_redo)
8720+
restoreRedobuff();
87148721
restore_search_patterns();
87158722
error = ERROR_NONE;
87168723
}

‎src/ex_cmds.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3530,14 +3530,6 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
35303530
check_fname() == FAIL)
35313531
goto theend;
35323532

3533-
#ifdef FEAT_QUICKFIX
3534-
/* ":e foobar" when already editing "foobar" will reload the file.
3535-
* But when 'buftype' is "nofile" there is no file to load, so don't
3536-
* do anything. */
3537-
if (curbuf->b_p_bt[0] == 'n' && curbuf->b_p_bt[2] == 'f')
3538-
goto theend;
3539-
#endif
3540-
35413533
oldbuf = (flags & ECMD_OLDBUF);
35423534
}
35433535

‎src/fileio.c

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2101,6 +2101,10 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
21012101
{
21022102
for (p = ptr; p < ptr + size; ++p)
21032103
{
2104+
/* Reset the carriage return counter. */
2105+
if (try_mac)
2106+
try_mac = 1;
2107+
21042108
if (*p == NL)
21052109
{
21062110
if (!try_unix
@@ -2110,6 +2114,8 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
21102114
fileformat = EOL_UNIX;
21112115
break;
21122116
}
2117+
else if (*p == CAR && try_mac)
2118+
try_mac++;
21132119
}
21142120

21152121
/* Don't give in to EOL_UNIX if EOL_MAC is more likely */
@@ -2133,6 +2139,10 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
21332139
fileformat = EOL_MAC;
21342140
}
21352141
}
2142+
else if (fileformat == EOL_UNKNOWN && try_mac == 1)
2143+
/* Looking for CR but found no end-of-line markers at
2144+
* all: use the default format. */
2145+
fileformat = default_fileformat();
21362146
}
21372147

21382148
/* No NL found: may use Mac format */
@@ -8555,21 +8565,22 @@ do_autocmd_event(event, pat, nested, cmd, forceit, group)
85558565
is_buflocal = FALSE;
85568566
buflocal_nr = 0;
85578567

8558-
if (patlen >= 7 && STRNCMP(pat, "<buffer", 7) == 0
8568+
if (patlen >= 8 && STRNCMP(pat, "<buffer", 7) == 0
85598569
&& pat[patlen - 1] == '>')
85608570
{
8561-
/* Error will be printed only for addition. printing and removing
8562-
* will proceed silently. */
8571+
/* "<buffer...>": Error will be printed only for addition.
8572+
* printing and removing will proceed silently. */
85638573
is_buflocal = TRUE;
85648574
if (patlen == 8)
8575+
/* "<buffer>" */
85658576
buflocal_nr = curbuf->b_fnum;
85668577
else if (patlen > 9 && pat[7] == '=')
85678578
{
8568-
/* <buffer=abuf> */
8569-
if (patlen == 13 && STRNICMP(pat, "<buffer=abuf>", 13))
8579+
if (patlen == 13 && STRNICMP(pat, "<buffer=abuf>", 13) == 0)
8580+
/* "<buffer=abuf>" */
85708581
buflocal_nr = autocmd_bufnr;
8571-
/* <buffer=123> */
85728582
else if (skipdigits(pat + 8) == pat + patlen - 1)
8583+
/* "<buffer=123>" */
85738584
buflocal_nr = atoi((char *)pat + 8);
85748585
}
85758586
}
@@ -9268,6 +9279,7 @@ apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
92689279
#ifdef FEAT_PROFILE
92699280
proftime_T wait_time;
92709281
#endif
9282+
int did_save_redobuff = FALSE;
92719283

92729284
/*
92739285
* Quickly return if there are no autocommands for this event or
@@ -9468,7 +9480,11 @@ apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
94689480
if (!autocmd_busy)
94699481
{
94709482
save_search_patterns();
9471-
saveRedobuff();
9483+
if (!ins_compl_active())
9484+
{
9485+
saveRedobuff();
9486+
did_save_redobuff = TRUE;
9487+
}
94729488
did_filetype = keep_filetype;
94739489
}
94749490

@@ -9568,7 +9584,8 @@ apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
95689584
if (!autocmd_busy)
95699585
{
95709586
restore_search_patterns();
9571-
restoreRedobuff();
9587+
if (did_save_redobuff)
9588+
restoreRedobuff();
95729589
did_filetype = FALSE;
95739590
while (au_pending_free_buf != NULL)
95749591
{

‎src/globals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ EXTERN int lcs_tab1 INIT(= NUL);
11691169
EXTERN int lcs_tab2 INIT(= NUL);
11701170
EXTERN int lcs_trail INIT(= NUL);
11711171
#ifdef FEAT_CONCEAL
1172-
EXTERN int lcs_conceal INIT(= '-');
1172+
EXTERN int lcs_conceal INIT(= ' ');
11731173
#endif
11741174

11751175
#if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) \

‎src/if_lua.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ luaV_list_insert (lua_State *L)
774774
{
775775
luaV_List *lis = luaV_checkudata(L, 1, LUAVIM_LIST);
776776
list_T *l = (list_T *) luaV_checkcache(L, (void *) *lis);
777-
long pos = luaL_optlong(L, 3, 0);
777+
long pos = (long) luaL_optinteger(L, 3, 0);
778778
listitem_T *li = NULL;
779779
typval_T v;
780780
if (l->lv_lock)

‎src/normal.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static void nv_end __ARGS((cmdarg_T *cap));
100100
static void nv_dollar __ARGS((cmdarg_T *cap));
101101
static void nv_search __ARGS((cmdarg_T *cap));
102102
static void nv_next __ARGS((cmdarg_T *cap));
103-
static void normal_search __ARGS((cmdarg_T *cap, int dir, char_u *pat, int opt));
103+
static int normal_search __ARGS((cmdarg_T *cap, int dir, char_u *pat, int opt));
104104
static void nv_csearch __ARGS((cmdarg_T *cap));
105105
static void nv_brackets __ARGS((cmdarg_T *cap));
106106
static void nv_percent __ARGS((cmdarg_T *cap));
@@ -5799,7 +5799,7 @@ nv_ident(cap)
57995799
init_history();
58005800
add_to_history(HIST_SEARCH, buf, TRUE, NUL);
58015801
#endif
5802-
normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
5802+
(void)normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
58035803
}
58045804
else
58055805
do_cmdline_cmd(buf);
@@ -6335,7 +6335,7 @@ nv_search(cap)
63356335
return;
63366336
}
63376337

6338-
normal_search(cap, cap->cmdchar, cap->searchbuf,
6338+
(void)normal_search(cap, cap->cmdchar, cap->searchbuf,
63396339
(cap->arg ? 0 : SEARCH_MARK));
63406340
}
63416341

@@ -6347,14 +6347,26 @@ nv_search(cap)
63476347
nv_next(cap)
63486348
cmdarg_T *cap;
63496349
{
6350-
normal_search(cap, 0, NULL, SEARCH_MARK | cap->arg);
6350+
pos_T old = curwin->w_cursor;
6351+
int i = normal_search(cap, 0, NULL, SEARCH_MARK | cap->arg);
6352+
6353+
if (i == 1 && equalpos(old, curwin->w_cursor))
6354+
{
6355+
/* Avoid getting stuck on the current cursor position, which can
6356+
* happen when an offset is given and the cursor is on the last char
6357+
* in the buffer: Repeat with count + 1. */
6358+
cap->count1 += 1;
6359+
(void)normal_search(cap, 0, NULL, SEARCH_MARK | cap->arg);
6360+
cap->count1 -= 1;
6361+
}
63516362
}
63526363

63536364
/*
63546365
* Search for "pat" in direction "dir" ('/' or '?', 0 for repeat).
63556366
* Uses only cap->count1 and cap->oap from "cap".
6367+
* Return 0 for failure, 1 for found, 2 for found and line offset added.
63566368
*/
6357-
static void
6369+
static int
63586370
normal_search(cap, dir, pat, opt)
63596371
cmdarg_T *cap;
63606372
int dir;
@@ -6388,6 +6400,7 @@ normal_search(cap, dir, pat, opt)
63886400
/* "/$" will put the cursor after the end of the line, may need to
63896401
* correct that here */
63906402
check_cursor();
6403+
return i;
63916404
}
63926405

63936406
/*

‎src/screen.c

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4571,7 +4571,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
45714571
int saved_nextra = n_extra;
45724572

45734573
#ifdef FEAT_CONCEAL
4574-
if ((is_concealing || boguscols > 0) && vcol_off > 0)
4574+
if (vcol_off > 0)
45754575
/* there are characters to conceal */
45764576
tab_len += vcol_off;
45774577
/* boguscols before FIX_FOR_BOGUSCOLS macro from above
@@ -4609,25 +4609,30 @@ win_line(wp, lnum, startrow, endrow, nochange)
46094609
#ifdef FEAT_CONCEAL
46104610
/* n_extra will be increased by FIX_FOX_BOGUSCOLS
46114611
* macro below, so need to adjust for that here */
4612-
if ((is_concealing || boguscols > 0) && vcol_off > 0)
4612+
if (vcol_off > 0)
46134613
n_extra -= vcol_off;
46144614
#endif
46154615
}
46164616
#endif
46174617
#ifdef FEAT_CONCEAL
4618-
/* Tab alignment should be identical regardless of
4619-
* 'conceallevel' value. So tab compensates of all
4620-
* previous concealed characters, and thus resets vcol_off
4621-
* and boguscols accumulated so far in the line. Note that
4622-
* the tab can be longer than 'tabstop' when there
4623-
* are concealed characters. */
4624-
FIX_FOR_BOGUSCOLS;
4625-
/* Make sure, the highlighting for the tab char will be
4626-
* correctly set further below (effectively reverts the
4627-
* FIX_FOR_BOGSUCOLS macro */
4628-
if (old_boguscols > 0 && n_extra > tab_len && wp->w_p_list
4618+
{
4619+
int vc_saved = vcol_off;
4620+
4621+
/* Tab alignment should be identical regardless of
4622+
* 'conceallevel' value. So tab compensates of all
4623+
* previous concealed characters, and thus resets
4624+
* vcol_off and boguscols accumulated so far in the
4625+
* line. Note that the tab can be longer than
4626+
* 'tabstop' when there are concealed characters. */
4627+
FIX_FOR_BOGUSCOLS;
4628+
4629+
/* Make sure, the highlighting for the tab char will be
4630+
* correctly set further below (effectively reverts the
4631+
* FIX_FOR_BOGSUCOLS macro */
4632+
if (n_extra == tab_len + vc_saved && wp->w_p_list
46294633
&& lcs_tab1)
4630-
tab_len += n_extra - tab_len;
4634+
tab_len += vc_saved;
4635+
}
46314636
#endif
46324637
#ifdef FEAT_MBYTE
46334638
mb_utf8 = FALSE; /* don't draw as UTF-8 */

‎src/testdir/Make_amiga.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
4848
test_listlbr.out \
4949
test_listlbr_utf8.out \
5050
test_mapping.out \
51+
test_marks.out \
5152
test_nested_function.out \
5253
test_options.out \
5354
test_qf_title.out \
@@ -188,6 +189,7 @@ test_insertcount.out: test_insertcount.in
188189
test_listlbr.out: test_listlbr.in
189190
test_listlbr_utf8.out: test_listlbr_utf8.in
190191
test_mapping.out: test_mapping.in
192+
test_marks.out: test_marks.in
191193
test_nested_function.out: test_nested_function.in
192194
test_options.out: test_options.in
193195
test_qf_title.out: test_qf_title.in

0 commit comments

Comments
 (0)