Mercurial > vim

diff src/misc1.c @ 6114:65b0974c5beb v7.4.395

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.395 Problem: C indent is wrong below an if with wrapped condition followed by curly braces. (Trevor Powell) Solution: Make a copy of tryposBrace.
author Bram Moolenaar <bram@vim.org>
date Wed, 06 Aug 2014 17:44:14 +0200
parents d3a674f6c737
children 96a4fa8e530c
line wrap: on
line diff
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6995,6 +6995,7 @@ get_c_indent()
     char_u	*linecopy;
     pos_T	*trypos;
     pos_T	*tryposBrace = NULL;
+    pos_T	tryposBraceCopy;
     pos_T	our_paren_pos;
     char_u	*start;
     int		start_brace;
@@ -7532,7 +7533,11 @@ get_c_indent()
 	/*
 	 * 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);