kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1159 from atwupack/vp-7.4.345

Browse Source 
vim-patch:7.4.345
This commit is contained in:
Justin M. Keyes 2014-09-10 17:09:04 -04:00
commit c54baaa319
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/indent.c
View File

@ -451,6 +451,7 @@ int get_breakindent_win(win_T *wp, char_u *line) {
static int prev_indent = 0; /* cached indent value */ static int prev_indent = 0; /* cached indent value */
static int prev_ts = 0L; /* cached tabstop value */ static int prev_ts = 0L; /* cached tabstop value */
static char_u *prev_line = NULL; /* cached pointer to line */ static char_u *prev_line = NULL; /* cached pointer to line */
static int prev_tick = 0; // changedtick of cached value
int bri = 0; int bri = 0;
/* window width minus window margin space, i.e. what rests for text */ /* window width minus window margin space, i.e. what rests for text */
const int eff_wwidth = wp->w_width const int eff_wwidth = wp->w_width
@ -459,10 +460,11 @@ int get_breakindent_win(win_T *wp, char_u *line) {
? number_width(wp) + 1 : 0); ? number_width(wp) + 1 : 0);
/* used cached indent, unless pointer or 'tabstop' changed */ /* used cached indent, unless pointer or 'tabstop' changed */
if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts) if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts
{ || prev_tick != wp->w_buffer->b_changedtick) {
prev_line = line; prev_line = line;
prev_ts = wp->w_buffer->b_p_ts; prev_ts = wp->w_buffer->b_p_ts;
prev_tick = wp->w_buffer->b_changedtick;
prev_indent = get_indent_str(line, prev_indent = get_indent_str(line,
(int)wp->w_buffer->b_p_ts, wp->w_p_list); (int)wp->w_buffer->b_p_ts, wp->w_p_list);
} }

2
src/nvim/version.c
View File

@ -250,7 +250,7 @@ static int included_patches[] = {
//348, //348,
//347, //347,
346, 346,
//345, 345,
344, 344,
343, 343,
//342 NA //342 NA