aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/indent.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-06-07 14:05:46 +0000
committerGitHub <noreply@github.com>2017-06-07 14:05:46 +0000
commitd3d0c9a7b11cad3f277f732dee6c782d1d911b48 (patch)
tree9440bfffd38ff3cdf98127c95764db1f84adadb7 /src/nvim/indent.c
parentcb0abce5be1dd6212425589b61826332834dc977 (diff)
parentca1ba1085a2be1f8963b48c9ccf3936359959924 (diff)
downloadrneovim-d3d0c9a7b11cad3f277f732dee6c782d1d911b48.tar.gz
rneovim-d3d0c9a7b11cad3f277f732dee6c782d1d911b48.tar.bz2
rneovim-d3d0c9a7b11cad3f277f732dee6c782d1d911b48.zip
Merge pull request #5621 from jamessan/vim-7.4.1975
vim-patch:7.4.1975,7.4.1976,7.4.1977,7.4.1978,7.4.1979,7.4.1986,7.4.2029,7.4.2224,8.0.0219,8.0.0614
Diffstat (limited to 'src/nvim/indent.c')
-rw-r--r--src/nvim/indent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index 5471b41b2c..efca739c2d 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -471,7 +471,7 @@ int get_breakindent_win(win_T *wp, char_u *line) {
|| prev_tick != wp->w_buffer->b_changedtick) {
prev_line = line;
prev_ts = wp->w_buffer->b_p_ts;
- prev_tick = wp->w_buffer->b_changedtick;
+ prev_tick = (int)wp->w_buffer->b_changedtick;
prev_indent = get_indent_str(line,
(int)wp->w_buffer->b_p_ts, wp->w_p_list);
}
@@ -538,7 +538,7 @@ int get_expr_indent(void)
sandbox++;
}
textlock++;
- indent = eval_to_number(curbuf->b_p_inde);
+ indent = (int)eval_to_number(curbuf->b_p_inde);
if (use_sandbox) {
sandbox--;