mirror of
https://github.com/neovim/neovim.git
synced 2025-10-02 16:08:36 +00:00
Fix warnings with gcc 6.1
The intentional behavior of do_sub was checked in vim
This commit is contained in:
@@ -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 \
|
||||
|
@@ -3816,9 +3816,10 @@ 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);
|
||||
|
||||
|
Reference in New Issue
Block a user