0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)

This commit is contained in:
Bram Moolenaar
2010-07-11 17:23:02 +02:00
parent 9028b10dfe
commit 3acfc30409
6 changed files with 63 additions and 23 deletions

View File

@@ -7545,7 +7545,8 @@ in_cinkeys(keytyped, when, line_is_empty)
if (try_match && keytyped == ':')
{
p = ml_get_curline();
if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30))
if (cin_iscase(p, FALSE) || cin_isscopedecl(p)
|| cin_islabel(30))
return TRUE;
/* Need to get the line again after cin_islabel(). */
p = ml_get_curline();
@@ -7554,7 +7555,7 @@ in_cinkeys(keytyped, when, line_is_empty)
&& p[curwin->w_cursor.col - 2] == ':')
{
p[curwin->w_cursor.col - 1] = ' ';
i = (cin_iscase(p) || cin_isscopedecl(p)
i = (cin_iscase(p, FALSE) || cin_isscopedecl(p)
|| cin_islabel(30));
p = ml_get_curline();
p[curwin->w_cursor.col - 1] = ':';