From 1a194fad22953401c13732d3a2b6d44bc4e87420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Sun, 15 May 2016 11:51:38 +0200
Subject: [PATCH] Fix warnings with gcc 6.1

The intentional behavior of do_sub was checked in vim
---
 src/nvim/assert.h  |  9 ++++++++-
 src/nvim/ex_cmds.c | 17 +++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/nvim/assert.h b/src/nvim/assert.h
index 2c43777858..761636305e 100644
--- a/src/nvim/assert.h
+++ b/src/nvim/assert.h
@@ -65,9 +65,16 @@
 # define STATIC_ASSERT_STATEMENT(cond, msg) _Static_assert(cond, msg)
 
 # undef STATIC_ASSERT_PRAGMA_START
+
+#if __GNUC__ >= 6
 # define STATIC_ASSERT_PRAGMA_START \
     _Pragma("GCC diagnostic push") \
-    _Pragma("GCC diagnostic ignored \"-pedantic\"") \
+    _Pragma("GCC diagnostic ignored \"-Wpedantic\"")
+#else
+# define STATIC_ASSERT_PRAGMA_START \
+    _Pragma("GCC diagnostic push") \
+    _Pragma("GCC diagnostic ignored \"-pedantic\"")
+#endif
 
 # undef STATIC_ASSERT_PRAGMA_END
 # define STATIC_ASSERT_PRAGMA_END \
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 415d6ee460..86f1a16216 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -3816,17 +3816,18 @@ skip:
       EMSG2(_(e_patnotf2), get_search_pat());
   }
 
-  if (do_ask && hasAnyFolding(curwin))
-    /* Cursor position may require updating */
+  if (do_ask && hasAnyFolding(curwin)) {
+    // Cursor position may require updating
     changed_window_setting();
-
-    vim_regfree(regmatch.regprog);
-
-    // Restore the flag values, they can be used for ":&&".
-    do_all = save_do_all;
-    do_ask = save_do_ask;
   }
 
+  vim_regfree(regmatch.regprog);
+
+  // Restore the flag values, they can be used for ":&&".
+  do_all = save_do_all;
+  do_ask = save_do_ask;
+}
+
 /*
  * Give message for number of substitutions.
  * Can also be used after a ":global" command.