summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-12-31 20:46:39 +0100
committerBram Moolenaar <Bram@vim.org>2015-12-31 20:46:39 +0100
commit2d820808cda15b3ad9fe674393d1f1e997453d9e (patch)
treeafc4a6637b5ba4d77a1de2f86d2995352eaae37e /src
parent53076830fea6df737455523f7e235bfe4f79864d (diff)
downloadvim-git-2d820808cda15b3ad9fe674393d1f1e997453d9e.tar.gz
patch 7.4.1010v7.4.1010
Problem: Some developers are unhappy while running tests. Solution: Add a test and some color.
Diffstat (limited to 'src')
-rw-r--r--src/ex_cmds.c5
-rw-r--r--src/testdir/test_assert.vim5
-rw-r--r--src/version.c2
3 files changed, 11 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index f7cc2576a..9da5c0956 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -7767,7 +7767,10 @@ ex_smile(eap)
msg_putchar('\n');
else
for (n = *p++; n > 0; --n)
- msg_putchar(*p);
+ if (*p == 'o' || *p == '$')
+ msg_putchar_attr(*p, hl_attr(HLF_L));
+ else
+ msg_putchar(*p);
msg_clr_eos();
}
diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim
index 049ce9885..25337a575 100644
--- a/src/testdir/test_assert.vim
+++ b/src/testdir/test_assert.vim
@@ -17,3 +17,8 @@ func Test_assert_equal()
let l = [1, 2, 3]
call assert_equal([1, 2, 3], l)
endfunc
+
+func Test_user_is_happy()
+ smile
+ sleep 300m
+endfunc
diff --git a/src/version.c b/src/version.c
index 6159942ba..59f9bc075 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1010,
+/**/
1009,
/**/
1008,