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