watiko

diff --git a/src/eval.c b/src/eval.c
index ea7f909..2ced3b6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3399,6 +3399,12 @@ set_context_for_expression(
 	    got_eq = TRUE;
 	    xp->xp_context = EXPAND_EXPRESSION;
 	}
+	else if ((c == '#')
+		&& xp->xp_context == EXPAND_EXPRESSION)

watiko

-- Test for linebreak and list option in utf-8 mode

local helpers = require('test.functional.helpers')
local clear = helpers.clear
local dedent = helpers.dedent
local eq = helpers.eq
local expect = helpers.expect
local feed = helpers.feed
local nvim = helpers.meths
local source = helpers.source

watiko

diff --git src/gui.c src/gui.c
index 57c2b20..f091fb8 100644
--- src/gui.c
+++ src/gui.c
@@ -1975,6 +1975,9 @@ gui_write(s, len)
 #endif
 
     gui_mch_flush();		    /* In case vim decides to take a nap */
+#if defined(FEAT_GUI_MACVIM)
+    gui_macvim_flush();

watiko

diff --git a/src/eval.c b/src/eval.c
index ef0ea5e..2668f3d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8073,11 +8073,13 @@ static struct fst
     {"argidx",         0, 0, f_argidx},
     {"arglistid",      0, 2, f_arglistid},
     {"argv",           0, 1, f_argv},
+#ifdef FEAT_FLOAT
+    {"asin",           1, 1, f_asin},  /* WJMc */