From df05574c97225aca59fa2de04a1516b9d070e654 Mon Sep 17 00:00:00 2001 From: Florian Walch Date: Tue, 23 Dec 2014 21:34:30 +0100 Subject: vim-patch:7.4.508 Problem: When generating ja.sjis.po the header is not correctly adjusted. Solution: Check for the right header string. (Ken Takata) https://code.google.com/p/vim/source/detail?r=v7-4-508 --- src/nvim/po/sjiscorr.c | 3 +-- src/nvim/version.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') 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..6b8ab7d007 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -230,7 +230,7 @@ static int included_patches[] = { //511 NA //510 NA //509, - //508, + 508, //507 NA //506 NA //505 NA -- cgit From 89bab9b90e3730c5b7685e7a25c5ec3fb6b1d8c8 Mon Sep 17 00:00:00 2001 From: Florian Walch Date: Tue, 23 Dec 2014 21:34:57 +0100 Subject: vim-patch:7.4.520 Problem: Sun PCK locale is not recognzed. Solution: Add PCK in the table. (Keiichi Oono) https://code.google.com/p/vim/source/detail?r=v7-4-520 --- src/nvim/mbyte.c | 1 + src/nvim/version.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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/version.c b/src/nvim/version.c index 6b8ab7d007..059f1eb090 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -218,7 +218,7 @@ static int included_patches[] = { //523 NA //522, //521, - //520, + 520, //519, //518, //517, -- cgit From 5e542ba56e7d34516ebe7d717b84959d476eb04c Mon Sep 17 00:00:00 2001 From: Florian Walch Date: Tue, 23 Dec 2014 21:37:19 +0100 Subject: vim-patch:7.4.513 Problem: Crash because reference count is wrong for list returned by getreg(). Solution: Increment the reference count. (Kimmy Lindvall) https://code.google.com/p/vim/source/detail?r=v7-4-513 --- src/nvim/eval.c | 3 +++ src/nvim/version.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 67a68f70d5..ffae24a380 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -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/version.c b/src/nvim/version.c index 059f1eb090..039a49006e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -225,7 +225,7 @@ static int included_patches[] = { //516, //515, //514, - //513, + 513, //512 NA //511 NA //510 NA -- cgit From 328617640617b07441b5cde8470c103f5d4591d6 Mon Sep 17 00:00:00 2001 From: Florian Walch Date: Tue, 23 Dec 2014 21:41:30 +0100 Subject: vim-patch:7.4.516 Problem: Completing a function name containing a # does not work. Issue 253. Solution: Recognize the # character. (Christian Brabandt) https://code.google.com/p/vim/source/detail?r=v7-4-516 --- src/nvim/eval.c | 4 ++-- src/nvim/version.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index ffae24a380..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 "" */ + /* Function name can start with "" and contain '#'. */ break; } else if (cmdidx != CMD_let || got_eq) { if (c == '"') { /* string */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 039a49006e..4d068627af 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -222,7 +222,7 @@ static int included_patches[] = { //519, //518, //517, - //516, + 516, //515, //514, 513, -- cgit From 05b2f01f6aee203faa08dbfa59cd19685dc6d710 Mon Sep 17 00:00:00 2001 From: Florian Walch Date: Tue, 23 Dec 2014 21:43:06 +0100 Subject: vim-patch:7.4.518 Problem: Using status line height in width computations. Solution: Use one instead. (Hirohito Higashi) https://code.google.com/p/vim/source/detail?r=v7-4-518 --- src/nvim/version.c | 2 +- src/nvim/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/version.c b/src/nvim/version.c index 4d068627af..b469d0e804 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -220,7 +220,7 @@ static int included_patches[] = { //521, 520, //519, - //518, + 518, //517, 516, //515, 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; } -- cgit