From f1b4622366d96c12ff4e01f21358467b4026e016 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 21 Oct 2014 14:15:17 +0200 Subject: [PATCH] updated for version 7.4.482 Problem: When 'balloonexpr' results in a list, the text has a trailing newline. (Lcd) Solution: Remove one trailing newline. --- src/gui_beval.c | 11 +++++++++++ src/version.c | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/gui_beval.c b/src/gui_beval.c index ae7845660..b3e51fb84 100644 --- a/src/gui_beval.c +++ b/src/gui_beval.c @@ -30,6 +30,7 @@ general_beval_cb(beval, state) long winnr = 0; char_u *bexpr; buf_T *save_curbuf; + size_t len; # ifdef FEAT_WINDOWS win_T *cw; # endif @@ -83,6 +84,16 @@ general_beval_cb(beval, state) vim_free(result); result = eval_to_string(bexpr, NULL, TRUE); + /* Remove one trailing newline, it is added when the result was a + * list and it's hardly every useful. If the user really wants a + * trailing newline he can add two and one remains. */ + if (result != NULL) + { + len = STRLEN(result); + if (len > 0 && result[len - 1] == NL) + result[len - 1] = NUL; + } + if (use_sandbox) --sandbox; --textlock; diff --git a/src/version.c b/src/version.c index 7923a4d93..7540f8ddc 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 482, /**/ 481, /**/ -- 2.40.0