|
 |
f486a62 |
To: vim_dev@googlegroups.com
|
|
|
f486a62 |
Subject: Patch 7.4.348
|
|
|
f486a62 |
Fcc: outbox
|
|
|
f486a62 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
f486a62 |
Mime-Version: 1.0
|
|
|
f486a62 |
Content-Type: text/plain; charset=UTF-8
|
|
|
f486a62 |
Content-Transfer-Encoding: 8bit
|
|
|
f486a62 |
------------
|
|
|
f486a62 |
|
|
|
f486a62 |
Patch 7.4.348
|
|
|
f486a62 |
Problem: When using "J1" in 'cinoptions' a line below a continuation line
|
|
|
f486a62 |
gets too much indent.
|
|
|
f486a62 |
Solution: Fix parenthesis in condition.
|
|
|
f486a62 |
Files: src/misc1.c
|
|
|
f486a62 |
|
|
|
f486a62 |
|
|
|
f486a62 |
*** ../vim-7.4.347/src/misc1.c 2014-06-26 21:24:53.134537205 +0200
|
|
|
f486a62 |
--- src/misc1.c 2014-07-02 16:58:08.854208322 +0200
|
|
|
f486a62 |
***************
|
|
|
f486a62 |
*** 7497,7505 ****
|
|
|
f486a62 |
* ldfd) {
|
|
|
f486a62 |
* }
|
|
|
f486a62 |
*/
|
|
|
f486a62 |
! if (curbuf->b_ind_js || (curbuf->b_ind_keep_case_label
|
|
|
f486a62 |
! && cin_iscase(skipwhite(ml_get_curline()), FALSE)))
|
|
|
f486a62 |
amount = get_indent();
|
|
|
f486a62 |
else
|
|
|
f486a62 |
amount = skip_label(lnum, &l);
|
|
|
f486a62 |
|
|
|
f486a62 |
--- 7497,7507 ----
|
|
|
f486a62 |
* ldfd) {
|
|
|
f486a62 |
* }
|
|
|
f486a62 |
*/
|
|
|
f486a62 |
! if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label)
|
|
|
f486a62 |
! && cin_iscase(skipwhite(ml_get_curline()), FALSE))
|
|
|
f486a62 |
amount = get_indent();
|
|
|
f486a62 |
+ else if (curbuf->b_ind_js)
|
|
|
f486a62 |
+ amount = get_indent_lnum(lnum);
|
|
|
f486a62 |
else
|
|
|
f486a62 |
amount = skip_label(lnum, &l);
|
|
|
f486a62 |
|
|
|
f486a62 |
*** ../vim-7.4.347/src/version.c 2014-06-26 22:33:47.850693627 +0200
|
|
|
f486a62 |
--- src/version.c 2014-07-02 16:46:14.934197383 +0200
|
|
|
f486a62 |
***************
|
|
|
f486a62 |
*** 736,737 ****
|
|
|
f486a62 |
--- 736,739 ----
|
|
|
f486a62 |
{ /* Add new patch number below this line */
|
|
|
f486a62 |
+ /**/
|
|
|
f486a62 |
+ 348,
|
|
|
f486a62 |
/**/
|
|
|
f486a62 |
|
|
|
f486a62 |
--
|
|
|
f486a62 |
5 out of 4 people have trouble with fractions.
|
|
|
f486a62 |
|
|
|
f486a62 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
f486a62 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
f486a62 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
f486a62 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|