Merge pull request #1732 from fwalch/small-patches

vim-patch: Small patches (3)

5 files changed, 13 insertions, 10 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 67a68f70d5..116944b28d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2580,10 +2580,10 @@ void set_context_for_expression(expand_T *xp, char_u *arg, cmdidx_T cmdidx)
     } else if (c == '=') {
       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 "<SNR>" */
+      /* Function name can start with "<SNR>" and contain '#'. */
       break;
     } else if (cmdidx != CMD_let || got_eq) {
       if (c == '"') {               /* string */
@@ -9553,6 +9553,9 @@ static void f_getreg(typval_T *argvars, typval_T *rettv)
     rettv->v_type = VAR_LIST;
     rettv->vval.v_list = 
       get_reg_contents(regname, (arg2 ? kGRegExprSrc : 0) | kGRegList);
+    if (rettv->vval.v_list != NULL) {
+      rettv->vval.v_list->lv_refcount++;
+    }
   } else {
     rettv->v_type = VAR_STRING;
     rettv->vval.v_string = get_reg_contents(regname, arg2 ? kGRegExprSrc : 0);
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 26eda01f98..3274c8d8ec 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -347,6 +347,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},
diff --git a/src/nvim/po/sjiscorr.c b/src/nvim/po/sjiscorr.c
index bce3477b90..ebcbe16dee 100644
--- a/src/nvim/po/sjiscorr.c
+++ b/src/nvim/po/sjiscorr.c
@@ -19,9 +19,8 @@ int main(int argc, char **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;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 91f160d83f..b469d0e804 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -218,19 +218,19 @@ static int included_patches[] = {
   //523 NA
   //522,
   //521,
-  //520,
+  520,
   //519,
-  //518,
+  518,
   //517,
-  //516,
+  516,
   //515,
   //514,
-  //513,
+  513,
   //512 NA
   //511 NA
   //510 NA
   //509,
-  //508,
+  508,
   //507 NA
   //506 NA
   //505 NA
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 029fcaac8b..1a102cf069 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -638,7 +638,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int 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;
         }