commit e10044015841711b989f9a898d427bcc1fdb4c32
author Bram Moolenaar <Bram@vim.org> Sat Oct 24 20:49:43 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Oct 24 20:49:43 2020 +0200
tree 256dbf4f826bbc408bb1eca2b381c4dc4f953eb6
parent 5661ed6c833e05467cab33cb9b1c535e7e5cc570

patch 8.2.1898: command modifier parsing always uses global cmdmod

Problem:    Command modifier parsing always uses global cmdmod.
Solution:   Pass in cmdmod_T to use.  Rename struct fields consistently.

src/option.c

diff --git a/src/option.c b/src/option.c
index dbb086d..935a325 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1125,7 +1125,7 @@
     else if (eap->cmdidx == CMD_setglobal)
 	flags = OPT_GLOBAL;
 #if defined(FEAT_EVAL) && defined(FEAT_BROWSE)
-    if (cmdmod.browse && flags == 0)
+    if ((cmdmod.cmod_flags & CMOD_BROWSE) && flags == 0)
 	ex_options(eap);
     else
 #endif
@@ -5774,7 +5774,7 @@
 	    buf->b_p_ml_nobin = p_ml_nobin;
 	    buf->b_p_inf = p_inf;
 	    COPY_OPT_SCTX(buf, BV_INF);
-	    if (cmdmod.noswapfile)
+	    if (cmdmod.cmod_flags & CMOD_NOSWAPFILE)
 		buf->b_p_swf = FALSE;
 	    else
 	    {