From 44c2db65dbad1f9166cad42d4704c128f0c9a364 Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Sat, 25 Apr 2015 21:11:03 +0200
Subject: vim-patch:7.4.553 #2513

Problem:    Various small issues.
Solution:   Fix those issues.

https://github.com/vim/vim/releases/tag/v7-4-553
---
 src/nvim/message.c         | 4 ++--
 src/nvim/testdir/test39.in | 4 ++++
 src/nvim/version.c         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 744f721410..52b023dc5e 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -3067,11 +3067,11 @@ static double tv_float(typval_T *tvs, int *idxp)
  * pointer for resulting string argument if "str_m" is zero (as per ISO C99).
  *
  * The return value is the number of characters which would be generated
- * for the given input, excluding the trailing null. If this value
+ * for the given input, excluding the trailing NUL. If this value
  * is greater or equal to "str_m", not all characters from the result
  * have been stored in str, output bytes beyond the ("str_m"-1) -th character
  * are discarded. If "str_m" is greater than zero it is guaranteed
- * the resulting string will be null-terminated.
+ * the resulting string will be NUL-terminated.
  */
 
 /*
diff --git a/src/nvim/testdir/test39.in b/src/nvim/testdir/test39.in
index 18da1b245a..c4e46fff26 100644
--- a/src/nvim/testdir/test39.in
+++ b/src/nvim/testdir/test39.in
@@ -88,6 +88,10 @@ bbbb
 cccc
 dddd
 
+yaaa
+¿¿¿
+bbb
+
 A23
 4567
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5a8e1930b0..9115c6a59f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -216,7 +216,7 @@ static int included_patches[] = {
   //556 NA
   //555 NA
   //554,
-  //553,
+  553,
   552,
   551,
   550,
-- 
cgit