|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.482
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.482
|
|
|
3ef2ca |
Problem: When 'balloonexpr' results in a list, the text has a trailing
|
|
|
3ef2ca |
newline. (Lcd)
|
|
|
3ef2ca |
Solution: Remove one trailing newline.
|
|
|
3ef2ca |
Files: src/gui_beval.c
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.481/src/gui_beval.c 2014-06-25 17:44:45.850768919 +0200
|
|
|
3ef2ca |
--- src/gui_beval.c 2014-10-21 14:12:13.915158215 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 30,35 ****
|
|
|
3ef2ca |
--- 30,36 ----
|
|
|
3ef2ca |
long winnr = 0;
|
|
|
3ef2ca |
char_u *bexpr;
|
|
|
3ef2ca |
buf_T *save_curbuf;
|
|
|
3ef2ca |
+ size_t len;
|
|
|
3ef2ca |
# ifdef FEAT_WINDOWS
|
|
|
3ef2ca |
win_T *cw;
|
|
|
3ef2ca |
# endif
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 83,88 ****
|
|
|
3ef2ca |
--- 84,99 ----
|
|
|
3ef2ca |
vim_free(result);
|
|
|
3ef2ca |
result = eval_to_string(bexpr, NULL, TRUE);
|
|
|
3ef2ca |
|
|
|
3ef2ca |
+ /* Remove one trailing newline, it is added when the result was a
|
|
|
3ef2ca |
+ * list and it's hardly every useful. If the user really wants a
|
|
|
3ef2ca |
+ * trailing newline he can add two and one remains. */
|
|
|
3ef2ca |
+ if (result != NULL)
|
|
|
3ef2ca |
+ {
|
|
|
3ef2ca |
+ len = STRLEN(result);
|
|
|
3ef2ca |
+ if (len > 0 && result[len - 1] == NL)
|
|
|
3ef2ca |
+ result[len - 1] = NUL;
|
|
|
3ef2ca |
+ }
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
if (use_sandbox)
|
|
|
3ef2ca |
--sandbox;
|
|
|
3ef2ca |
--textlock;
|
|
|
3ef2ca |
*** ../vim-7.4.481/src/version.c 2014-10-16 20:35:32.146264814 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-10-21 14:13:19.571158359 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 482,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
You cannot propel yourself forward by patting yourself on the back.
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|