neovim/neovim — pull request #1732 by fwalch (2014-12-23 20:50:24+00:00)
Title: [RFC] vim-patch: Small patches (3)

### 508
```diff
diff --git a/src/nvim/po/sjiscorr.c b/src/nvim/po/sjiscorr.c
--- a/src/nvim/po/sjiscorr.c
+++ b/src/nvim/po/sjiscorr.c
@@ -23,9 +23,8 @@ main(argc, argv)
fputs("charset=cp932", stdout);
p += 12;
}
-	else if (strncmp(p, "ja.po - Japanese message file", 29) == 0)
+	else if (strncmp(p, "# Original translations", 23) == 0)
{
-	fputs("ja.sjis.po - Japanese message file for Vim (version 6.x)\n", stdout);
fputs("# generated from ja.po, DO NOT EDIT", stdout);
while (p[1] != '\n')
++p;
```

### 520
```diff
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -405,6 +405,7 @@ enc_alias_table[] =
{"unix-jis",	IDX_EUC_JP},
{"ujis",	IDX_EUC_JP},
{"shift-jis",	IDX_SJIS},
+ {"pck",	IDX_SJIS},	/* Sun: PCK */
{"euckr",	IDX_EUC_KR},
{"5601",	IDX_EUC_KR},	/* Sun: KS C 5601 */
{"euccn",	IDX_EUC_CN},
```
### 513

```diff
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -12008,6 +12008,8 @@ f_getreg(argvars, rettv)
rettv->v_type = VAR_LIST;
rettv->vval.v_list = (list_T *)get_reg_contents(regname,
(arg2 ? GREG_EXPR_SRC : 0) | GREG_LIST);
+	if (rettv->vval.v_list != NULL)
+	++rettv->vval.v_list->lv_refcount;
}
else
{
```

### 516

```diff
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -3368,11 +3368,11 @@ set_context_for_expression(xp, arg, cmdi
got_eq = TRUE;
xp->xp_context = EXPAND_EXPRESSION;
}
-	else if (c == '<'
+	else if ((c == '<' || c == '#')
&& xp->xp_context == EXPAND_FUNCTIONS
&& vim_strchr(xp->xp_pattern, '(') == NULL)
{
-	/* Function name can start with "" */
+	/* Function name can start with "" and contain '#'. */
break;
}
else if (cmdidx != CMD_let || got_eq)
```

### 518

```diff
diff --git a/src/nvim/window.c b/src/nvim/window.c
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -796,7 +796,7 @@ win_split_ins(size, flags, new_wp, dir)
if (frp->fr_win != oldwin && frp->fr_win != NULL
&& (frp->fr_win->w_width > new_size
|| frp->fr_win->w_width > oldwin->w_width
-	- new_size - STATUS_HEIGHT))
+	- new_size - 1))
{
do_equal = TRUE;
break;
```