Mercurial > vim
comparison src/edit.c @ 2297:5ffe000a9ecf vim73
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sun, 11 Jul 2010 17:23:02 +0200 |
parents | 2209060c340d |
children | c79ccf947487 |
comparison
equal
deleted
inserted
replaced
2296:eb7be7b075a6 | 2297:5ffe000a9ecf |
---|---|
7543 else if (*look == ':') | 7543 else if (*look == ':') |
7544 { | 7544 { |
7545 if (try_match && keytyped == ':') | 7545 if (try_match && keytyped == ':') |
7546 { | 7546 { |
7547 p = ml_get_curline(); | 7547 p = ml_get_curline(); |
7548 if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30)) | 7548 if (cin_iscase(p, FALSE) || cin_isscopedecl(p) |
7549 || cin_islabel(30)) | |
7549 return TRUE; | 7550 return TRUE; |
7550 /* Need to get the line again after cin_islabel(). */ | 7551 /* Need to get the line again after cin_islabel(). */ |
7551 p = ml_get_curline(); | 7552 p = ml_get_curline(); |
7552 if (curwin->w_cursor.col > 2 | 7553 if (curwin->w_cursor.col > 2 |
7553 && p[curwin->w_cursor.col - 1] == ':' | 7554 && p[curwin->w_cursor.col - 1] == ':' |
7554 && p[curwin->w_cursor.col - 2] == ':') | 7555 && p[curwin->w_cursor.col - 2] == ':') |
7555 { | 7556 { |
7556 p[curwin->w_cursor.col - 1] = ' '; | 7557 p[curwin->w_cursor.col - 1] = ' '; |
7557 i = (cin_iscase(p) || cin_isscopedecl(p) | 7558 i = (cin_iscase(p, FALSE) || cin_isscopedecl(p) |
7558 || cin_islabel(30)); | 7559 || cin_islabel(30)); |
7559 p = ml_get_curline(); | 7560 p = ml_get_curline(); |
7560 p[curwin->w_cursor.col - 1] = ':'; | 7561 p[curwin->w_cursor.col - 1] = ':'; |
7561 if (i) | 7562 if (i) |
7562 return TRUE; | 7563 return TRUE; |