3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.346
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.346 (after 7.4.338)
3ef2ca
Problem:    Indent is not updated when changing 'breakindentopt'. (itchyny)
3ef2ca
Solution:   Do not cache "brishift". (Christian Brabandt)
3ef2ca
Files:	    src/misc1.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.345/src/misc1.c	2014-06-25 22:55:34.783474435 +0200
3ef2ca
--- src/misc1.c	2014-06-26 21:15:46.970516542 +0200
3ef2ca
***************
3ef2ca
*** 513,523 ****
3ef2ca
  	prev_ts = wp->w_buffer->b_p_ts;
3ef2ca
  	prev_tick = wp->w_buffer->b_changedtick;
3ef2ca
  	prev_indent = get_indent_str(line,
3ef2ca
! 		  (int)wp->w_buffer->b_p_ts, wp->w_p_list) + wp->w_p_brishift;
3ef2ca
      }
3ef2ca
  
3ef2ca
      /* indent minus the length of the showbreak string */
3ef2ca
-     bri = prev_indent;
3ef2ca
      if (wp->w_p_brisbr)
3ef2ca
  	bri -= vim_strsize(p_sbr);
3ef2ca
  
3ef2ca
--- 513,523 ----
3ef2ca
  	prev_ts = wp->w_buffer->b_p_ts;
3ef2ca
  	prev_tick = wp->w_buffer->b_changedtick;
3ef2ca
  	prev_indent = get_indent_str(line,
3ef2ca
! 				     (int)wp->w_buffer->b_p_ts, wp->w_p_list);
3ef2ca
      }
3ef2ca
+     bri = prev_indent + wp->w_p_brishift;
3ef2ca
  
3ef2ca
      /* indent minus the length of the showbreak string */
3ef2ca
      if (wp->w_p_brisbr)
3ef2ca
  	bri -= vim_strsize(p_sbr);
3ef2ca
  
3ef2ca
*** ../vim-7.4.345/src/version.c	2014-06-25 22:55:34.783474435 +0200
3ef2ca
--- src/version.c	2014-06-26 21:17:10.342519697 +0200
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     346,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
A computer programmer is a device for turning requirements into
3ef2ca
undocumented features.  It runs on cola, pizza and Dilbert cartoons.
3ef2ca
					Bram Moolenaar
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///