diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index f7cc2576a8..9da5c0956e 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 049ce98859..25337a575e 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 6159942bab..59f9bc075e 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 */
+/**/
+    1010,
 /**/
     1009,
 /**/