summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-02 23:59:35 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-02 23:59:35 +0100
commit92c2db8be669b9e5038a5a9b8e02ca8856747d77 (patch)
tree7f1f9882e9e9bc59176751c2827e9eac0ca66103
parent0ffbbf9ea871dd64c2be933d6718f0b34fe960c4 (diff)
downloadvim-git-92c2db8be669b9e5038a5a9b8e02ca8856747d77.tar.gz
updated for version 7.4.058v7.4.058
Problem: Warnings on 64 bit Windows. Solution: Add type casts. (Mike Williams)
-rw-r--r--src/ops.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ops.c b/src/ops.c
index 91d3a4b0f..4a198487c 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5009,14 +5009,14 @@ format_lines(line_count, avoid_fex)
if (second_indent > 0) /* the "leader" for FO_Q_SECOND */
{
char_u *p = ml_get_curline();
- int indent = skipwhite(p) - p;
+ int indent = (int)(skipwhite(p) - p);
if (indent > 0)
{
(void)del_bytes(indent, FALSE, FALSE);
mark_col_adjust(curwin->w_cursor.lnum,
(colnr_T)0, 0L, (long)-indent);
- }
+ }
}
curwin->w_cursor.lnum--;
if (do_join(2, TRUE, FALSE, FALSE) == FAIL)
diff --git a/src/version.c b/src/version.c
index d76370f60..1db6ae92d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 58,
+/**/
57,
/**/
56,