|
 |
b167e30 |
To: vim_dev@googlegroups.com
|
|
|
b167e30 |
Subject: Patch 7.3.213
|
|
|
b167e30 |
Fcc: outbox
|
|
|
b167e30 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
b167e30 |
Mime-Version: 1.0
|
|
|
b167e30 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b167e30 |
Content-Transfer-Encoding: 8bit
|
|
|
b167e30 |
------------
|
|
|
b167e30 |
|
|
|
b167e30 |
Patch 7.3.213
|
|
|
b167e30 |
Problem: Javascript object literal is not indented correctly.
|
|
|
b167e30 |
Solution: Make a special case for when "J1" is in 'cino'. (Luc Deschenaux)
|
|
|
b167e30 |
Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok
|
|
|
b167e30 |
|
|
|
b167e30 |
|
|
|
b167e30 |
*** ../mercurial/vim73/src/misc1.c 2011-05-25 17:29:40.000000000 +0200
|
|
|
b167e30 |
--- src/misc1.c 2011-06-10 04:58:10.000000000 +0200
|
|
|
b167e30 |
***************
|
|
|
b167e30 |
*** 6965,6971 ****
|
|
|
b167e30 |
* ldfd) {
|
|
|
b167e30 |
* }
|
|
|
b167e30 |
*/
|
|
|
b167e30 |
! if ((ind_keep_case_label
|
|
|
b167e30 |
&& cin_iscase(skipwhite(ml_get_curline()), FALSE)))
|
|
|
b167e30 |
amount = get_indent();
|
|
|
b167e30 |
else
|
|
|
b167e30 |
--- 6965,6971 ----
|
|
|
b167e30 |
* ldfd) {
|
|
|
b167e30 |
* }
|
|
|
b167e30 |
*/
|
|
|
b167e30 |
! if (ind_js || (ind_keep_case_label
|
|
|
b167e30 |
&& cin_iscase(skipwhite(ml_get_curline()), FALSE)))
|
|
|
b167e30 |
amount = get_indent();
|
|
|
b167e30 |
else
|
|
|
b167e30 |
*** ../mercurial/vim73/src/testdir/test3.in 2011-05-25 15:16:06.000000000 +0200
|
|
|
b167e30 |
--- src/testdir/test3.in 2011-06-12 21:44:12.000000000 +0200
|
|
|
b167e30 |
***************
|
|
|
b167e30 |
*** 1492,1501 ****
|
|
|
b167e30 |
|
|
|
b167e30 |
STARTTEST
|
|
|
b167e30 |
:set cino=N-s
|
|
|
b167e30 |
! /namespaces
|
|
|
b167e30 |
=/^NAMESPACEEND
|
|
|
b167e30 |
ENDTEST
|
|
|
b167e30 |
|
|
|
b167e30 |
/* valid namespaces with normal indent */
|
|
|
b167e30 |
namespace
|
|
|
b167e30 |
{
|
|
|
b167e30 |
--- 1492,1502 ----
|
|
|
b167e30 |
|
|
|
b167e30 |
STARTTEST
|
|
|
b167e30 |
:set cino=N-s
|
|
|
b167e30 |
! /^NAMESPACESTART
|
|
|
b167e30 |
=/^NAMESPACEEND
|
|
|
b167e30 |
ENDTEST
|
|
|
b167e30 |
|
|
|
b167e30 |
+ NAMESPACESTART
|
|
|
b167e30 |
/* valid namespaces with normal indent */
|
|
|
b167e30 |
namespace
|
|
|
b167e30 |
{
|
|
|
b167e30 |
***************
|
|
|
b167e30 |
*** 1561,1566 ****
|
|
|
b167e30 |
--- 1562,1588 ----
|
|
|
b167e30 |
|
|
|
b167e30 |
|
|
|
b167e30 |
STARTTEST
|
|
|
b167e30 |
+ :set cino=J1
|
|
|
b167e30 |
+ /^JSSTART
|
|
|
b167e30 |
+ =/^JSEND
|
|
|
b167e30 |
+ ENDTEST
|
|
|
b167e30 |
+
|
|
|
b167e30 |
+ JSSTART
|
|
|
b167e30 |
+ var bar = {
|
|
|
b167e30 |
+ foo: {
|
|
|
b167e30 |
+ that: this,
|
|
|
b167e30 |
+ some: ok,
|
|
|
b167e30 |
+ },
|
|
|
b167e30 |
+ "bar":{
|
|
|
b167e30 |
+ a : 2,
|
|
|
b167e30 |
+ b: "123abc",
|
|
|
b167e30 |
+ x: 4,
|
|
|
b167e30 |
+ "y": 5
|
|
|
b167e30 |
+ }
|
|
|
b167e30 |
+ }
|
|
|
b167e30 |
+ JSEND
|
|
|
b167e30 |
+
|
|
|
b167e30 |
+ STARTTEST
|
|
|
b167e30 |
:g/^STARTTEST/.,/^ENDTEST/d
|
|
|
b167e30 |
:1;/start of AUTO/,$wq! test.out
|
|
|
b167e30 |
ENDTEST
|
|
|
b167e30 |
*** ../mercurial/vim73/src/testdir/test3.ok 2011-05-25 15:16:06.000000000 +0200
|
|
|
b167e30 |
--- src/testdir/test3.ok 2011-06-12 21:44:26.000000000 +0200
|
|
|
b167e30 |
***************
|
|
|
b167e30 |
*** 1337,1342 ****
|
|
|
b167e30 |
--- 1337,1343 ----
|
|
|
b167e30 |
}
|
|
|
b167e30 |
|
|
|
b167e30 |
|
|
|
b167e30 |
+ NAMESPACESTART
|
|
|
b167e30 |
/* valid namespaces with normal indent */
|
|
|
b167e30 |
namespace
|
|
|
b167e30 |
{
|
|
|
b167e30 |
***************
|
|
|
b167e30 |
*** 1401,1403 ****
|
|
|
b167e30 |
--- 1402,1420 ----
|
|
|
b167e30 |
NAMESPACEEND
|
|
|
b167e30 |
|
|
|
b167e30 |
|
|
|
b167e30 |
+
|
|
|
b167e30 |
+ JSSTART
|
|
|
b167e30 |
+ var bar = {
|
|
|
b167e30 |
+ foo: {
|
|
|
b167e30 |
+ that: this,
|
|
|
b167e30 |
+ some: ok,
|
|
|
b167e30 |
+ },
|
|
|
b167e30 |
+ "bar":{
|
|
|
b167e30 |
+ a : 2,
|
|
|
b167e30 |
+ b: "123abc",
|
|
|
b167e30 |
+ x: 4,
|
|
|
b167e30 |
+ "y": 5
|
|
|
b167e30 |
+ }
|
|
|
b167e30 |
+ }
|
|
|
b167e30 |
+ JSEND
|
|
|
b167e30 |
+
|
|
|
b167e30 |
*** ../vim-7.3.212/src/version.c 2011-06-12 21:37:06.000000000 +0200
|
|
|
b167e30 |
--- src/version.c 2011-06-12 21:48:34.000000000 +0200
|
|
|
b167e30 |
***************
|
|
|
b167e30 |
*** 711,712 ****
|
|
|
b167e30 |
--- 711,714 ----
|
|
|
b167e30 |
{ /* Add new patch number below this line */
|
|
|
b167e30 |
+ /**/
|
|
|
b167e30 |
+ 213,
|
|
|
b167e30 |
/**/
|
|
|
b167e30 |
|
|
|
b167e30 |
--
|
|
|
b167e30 |
hundred-and-one symptoms of being an internet addict:
|
|
|
b167e30 |
169. You hire a housekeeper for your home page.
|
|
|
b167e30 |
|
|
|
b167e30 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
b167e30 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
b167e30 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
b167e30 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|