|
 |
1900a48 |
To: vim_dev@googlegroups.com
|
|
|
1900a48 |
Subject: Patch 7.4.058
|
|
|
1900a48 |
Fcc: outbox
|
|
|
1900a48 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1900a48 |
Mime-Version: 1.0
|
|
|
1900a48 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1900a48 |
Content-Transfer-Encoding: 8bit
|
|
|
1900a48 |
------------
|
|
|
1900a48 |
|
|
|
1900a48 |
Patch 7.4.058
|
|
|
1900a48 |
Problem: Warnings on 64 bit Windows.
|
|
|
1900a48 |
Solution: Add type casts. (Mike Williams)
|
|
|
1900a48 |
Files: src/ops.c
|
|
|
1900a48 |
|
|
|
1900a48 |
|
|
|
1900a48 |
*** ../vim-7.4.057/src/ops.c 2013-10-06 17:46:48.000000000 +0200
|
|
|
1900a48 |
--- src/ops.c 2013-11-02 23:56:15.000000000 +0100
|
|
|
1900a48 |
***************
|
|
|
1900a48 |
*** 5009,5022 ****
|
|
|
1900a48 |
if (second_indent > 0) /* the "leader" for FO_Q_SECOND */
|
|
|
1900a48 |
{
|
|
|
1900a48 |
char_u *p = ml_get_curline();
|
|
|
1900a48 |
! int indent = skipwhite(p) - p;
|
|
|
1900a48 |
|
|
|
1900a48 |
if (indent > 0)
|
|
|
1900a48 |
{
|
|
|
1900a48 |
(void)del_bytes(indent, FALSE, FALSE);
|
|
|
1900a48 |
mark_col_adjust(curwin->w_cursor.lnum,
|
|
|
1900a48 |
(colnr_T)0, 0L, (long)-indent);
|
|
|
1900a48 |
! }
|
|
|
1900a48 |
}
|
|
|
1900a48 |
curwin->w_cursor.lnum--;
|
|
|
1900a48 |
if (do_join(2, TRUE, FALSE, FALSE) == FAIL)
|
|
|
1900a48 |
--- 5009,5022 ----
|
|
|
1900a48 |
if (second_indent > 0) /* the "leader" for FO_Q_SECOND */
|
|
|
1900a48 |
{
|
|
|
1900a48 |
char_u *p = ml_get_curline();
|
|
|
1900a48 |
! int indent = (int)(skipwhite(p) - p);
|
|
|
1900a48 |
|
|
|
1900a48 |
if (indent > 0)
|
|
|
1900a48 |
{
|
|
|
1900a48 |
(void)del_bytes(indent, FALSE, FALSE);
|
|
|
1900a48 |
mark_col_adjust(curwin->w_cursor.lnum,
|
|
|
1900a48 |
(colnr_T)0, 0L, (long)-indent);
|
|
|
1900a48 |
! }
|
|
|
1900a48 |
}
|
|
|
1900a48 |
curwin->w_cursor.lnum--;
|
|
|
1900a48 |
if (do_join(2, TRUE, FALSE, FALSE) == FAIL)
|
|
|
1900a48 |
*** ../vim-7.4.057/src/version.c 2013-11-02 23:29:17.000000000 +0100
|
|
|
1900a48 |
--- src/version.c 2013-11-02 23:55:01.000000000 +0100
|
|
|
1900a48 |
***************
|
|
|
1900a48 |
*** 740,741 ****
|
|
|
1900a48 |
--- 740,743 ----
|
|
|
1900a48 |
{ /* Add new patch number below this line */
|
|
|
1900a48 |
+ /**/
|
|
|
1900a48 |
+ 58,
|
|
|
1900a48 |
/**/
|
|
|
1900a48 |
|
|
|
1900a48 |
--
|
|
|
1900a48 |
Citizens are not allowed to attend a movie house or theater nor ride in a
|
|
|
1900a48 |
public streetcar within at least four hours after eating garlic.
|
|
|
1900a48 |
[real standing law in Indiana, United States of America]
|
|
|
1900a48 |
|
|
|
1900a48 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1900a48 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1900a48 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
1900a48 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|