1 files changed, 8 insertions, 13 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 3143363af6..b03c25a098 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -3615,16 +3615,13 @@ void do_sub(exarg_T *eap)
   /*
    * Find trailing options.  When '&' is used, keep old options.
    */
-  if (*cmd == '&')
+  if (*cmd == '&') {
     ++cmd;
-  else {
-    if (!p_ed) {
-      if (p_gd)                 /* default is global on */
-        do_all = TRUE;
-      else
-        do_all = FALSE;
-      do_ask = FALSE;
-    }
+  } else {
+    // default is global on
+    do_all = p_gd ? TRUE : FALSE;
+
+    do_ask = FALSE;
     do_error = TRUE;
     do_print = FALSE;
     do_count = false;
@@ -3632,10 +3629,8 @@ void do_sub(exarg_T *eap)
     do_ic = 0;
   }
   while (*cmd) {
-    /*
-     * Note that 'g' and 'c' are always inverted, also when p_ed is off.
-     * 'r' is never inverted.
-     */
+    // Note that 'g' and 'c' are always inverted.
+    // 'r' is never inverted.
     if (*cmd == 'g')
       do_all = !do_all;
     else if (*cmd == 'c')