1 To: vim_dev@googlegroups.com
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
11 Problem: Wrong indenting for array initializer.
12 Solution: Detect '}' in a better way. (Lech Lorens)
13 Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok
16 *** ../vim-7.3.248/src/misc1.c 2011-06-12 21:51:01.000000000 +0200
17 --- src/misc1.c 2011-07-15 14:06:44.000000000 +0200
20 * If we're at the end of a block, skip to the start of
23 ! curwin->w_cursor.col = 0;
24 ! if (*cin_skipcomment(l) == '}'
25 && (trypos = find_start_brace(ind_maxcomment))
29 * If we're at the end of a block, skip to the start of
32 ! if (find_last_paren(l, '{', '}')
33 && (trypos = find_start_brace(ind_maxcomment))
36 *** ../vim-7.3.248/src/testdir/test3.in 2011-06-12 21:51:01.000000000 +0200
37 --- src/testdir/test3.in 2011-07-15 14:03:41.000000000 +0200
55 + printf("Indent this line correctly!\n");
67 + printf("But don't break the indentation of this instruction\n");
77 *** ../vim-7.3.248/src/testdir/test3.ok 2011-06-12 21:51:01.000000000 +0200
78 --- src/testdir/test3.ok 2011-07-15 14:03:41.000000000 +0200
90 + printf("Indent this line correctly!\n");
102 + printf("But don't break the indentation of this instruction\n");
113 *** ../vim-7.3.248/src/version.c 2011-07-15 13:51:57.000000000 +0200
114 --- src/version.c 2011-07-15 14:12:05.000000000 +0200
118 { /* Add new patch number below this line */
124 GALAHAD hurries to the door and pushes through it. As he leaves the room
125 we CUT TO the reverse to show that he is now in a room full of bathing
126 and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile
127 enchantingly at him as he tries to keep walking without being diverted by
128 the lovely sights assaulting his eyeballs.
129 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
131 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
132 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
133 \\\ an exciting new programming language -- http://www.Zimbu.org ///
134 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///