mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-02 07:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings with gcc 6.1

Browse Source 
The intentional behavior of do_sub was checked in vim
This commit is contained in:
Björn Linse
2016-05-15 11:51:38 +02:00
parent 509089d053
commit 1a194fad22
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/assert.h
View File

@@ -65,9 +65,16 @@
# define STATIC_ASSERT_STATEMENT(cond, msg) _Static_assert(cond, msg) # define STATIC_ASSERT_STATEMENT(cond, msg) _Static_assert(cond, msg)
# undef STATIC_ASSERT_PRAGMA_START # undef STATIC_ASSERT_PRAGMA_START
#if __GNUC__ >= 6
# define STATIC_ASSERT_PRAGMA_START \ # define STATIC_ASSERT_PRAGMA_START \
_Pragma("GCC diagnostic push") \ _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 # undef STATIC_ASSERT_PRAGMA_END
# define STATIC_ASSERT_PRAGMA_END \ # define STATIC_ASSERT_PRAGMA_END \

17
src/nvim/ex_cmds.c
View File

@@ -3816,17 +3816,18 @@ skip:
EMSG2(_(e_patnotf2), get_search_pat()); EMSG2(_(e_patnotf2), get_search_pat());
} }
if (do_ask && hasAnyFolding(curwin)) if (do_ask && hasAnyFolding(curwin)) {
/* Cursor position may require updating */ // Cursor position may require updating
changed_window_setting(); 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. * Give message for number of substitutions.
* Can also be used after a ":global" command. * Can also be used after a ":global" command.