diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-23 14:31:09 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-23 14:31:09 -0500 |
| commit | e274c5f6223a8b0f1bbd811ad962af3d1ec8aa80 (patch) | |
| tree | 89ea80b8f0d403e472a52367f940f268e4f2d05a /src/nvim/indent_c.c | |
| parent | 79fd93768ace47cdacd3f4b7afb3feaa57353c04 (diff) | |
| parent | 1053f49ab08681ad2a7f98ee66aa90db9442d937 (diff) | |
| download | rneovim-e274c5f6223a8b0f1bbd811ad962af3d1ec8aa80.tar.gz rneovim-e274c5f6223a8b0f1bbd811ad962af3d1ec8aa80.tar.bz2 rneovim-e274c5f6223a8b0f1bbd811ad962af3d1ec8aa80.zip | |
Merge pull request #1721 from fwalch/vim-7.4.395
vim-patch:7.4.395
Diffstat (limited to 'src/nvim/indent_c.c')
| -rw-r--r-- | src/nvim/indent_c.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index bbc0b291dc..39ad512227 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -1545,6 +1545,7 @@ int get_c_indent(void) char_u *linecopy; pos_T *trypos; pos_T *tryposBrace = NULL; + pos_T tryposBraceCopy; pos_T our_paren_pos; char_u *start; int start_brace; @@ -2026,6 +2027,10 @@ int get_c_indent(void) } else { // We are inside braces, there is a { before this line at the position // stored in tryposBrace. + // Make a copy of tryposBrace, it may point to pos_copy inside + // find_start_brace(), which may be changed somewhere. + tryposBraceCopy = *tryposBrace; + tryposBrace = &tryposBraceCopy; trypos = tryposBrace; ourscope = trypos->lnum; start = ml_get(ourscope); |