|
 |
a1c7236 |
To: vim-dev@vim.org
|
|
|
a1c7236 |
Subject: Patch 7.2.275
|
|
|
a1c7236 |
Fcc: outbox
|
|
|
a1c7236 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
a1c7236 |
Mime-Version: 1.0
|
|
|
a1c7236 |
Content-Type: text/plain; charset=UTF-8
|
|
|
a1c7236 |
Content-Transfer-Encoding: 8bit
|
|
|
a1c7236 |
------------
|
|
|
a1c7236 |
|
|
|
a1c7236 |
Patch 7.2.275
|
|
|
a1c7236 |
Problem: Warning for unused argument and comparing signed and unsigned.
|
|
|
a1c7236 |
Solution: Add type cast.
|
|
|
a1c7236 |
Files: src/memline.c
|
|
|
a1c7236 |
|
|
|
a1c7236 |
|
|
|
a1c7236 |
*** ../vim-7.2.274/src/memline.c 2009-11-03 13:06:03.000000000 +0100
|
|
|
a1c7236 |
--- src/memline.c 2009-10-29 20:55:08.000000000 +0100
|
|
|
a1c7236 |
***************
|
|
|
a1c7236 |
*** 1285,1291 ****
|
|
|
a1c7236 |
for (i = 0; i < dp->db_line_count; ++i)
|
|
|
a1c7236 |
{
|
|
|
a1c7236 |
txt_start = (dp->db_index[i] & DB_INDEX_MASK);
|
|
|
a1c7236 |
! if (txt_start <= HEADER_SIZE
|
|
|
a1c7236 |
|| txt_start >= (int)dp->db_txt_end)
|
|
|
a1c7236 |
{
|
|
|
a1c7236 |
p = (char_u *)"???";
|
|
|
a1c7236 |
--- 1285,1291 ----
|
|
|
a1c7236 |
for (i = 0; i < dp->db_line_count; ++i)
|
|
|
a1c7236 |
{
|
|
|
a1c7236 |
txt_start = (dp->db_index[i] & DB_INDEX_MASK);
|
|
|
a1c7236 |
! if (txt_start <= (int)HEADER_SIZE
|
|
|
a1c7236 |
|| txt_start >= (int)dp->db_txt_end)
|
|
|
a1c7236 |
{
|
|
|
a1c7236 |
p = (char_u *)"???";
|
|
|
a1c7236 |
***************
|
|
|
a1c7236 |
*** 1296,1302 ****
|
|
|
a1c7236 |
ml_append(lnum++, p, (colnr_T)0, TRUE);
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
if (has_error)
|
|
|
a1c7236 |
! ml_append(lnum++, (char_u *)_("???END"), (colnr_T)0, TRUE);
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
--- 1296,1303 ----
|
|
|
a1c7236 |
ml_append(lnum++, p, (colnr_T)0, TRUE);
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
if (has_error)
|
|
|
a1c7236 |
! ml_append(lnum++, (char_u *)_("???END"),
|
|
|
a1c7236 |
! (colnr_T)0, TRUE);
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
}
|
|
|
a1c7236 |
***************
|
|
|
a1c7236 |
*** 3576,3586 ****
|
|
|
a1c7236 |
* Make swap file name out of the file name and a directory name.
|
|
|
a1c7236 |
* Returns pointer to allocated memory or NULL.
|
|
|
a1c7236 |
*/
|
|
|
a1c7236 |
- /*ARGSUSED*/
|
|
|
a1c7236 |
char_u *
|
|
|
a1c7236 |
makeswapname(fname, ffname, buf, dir_name)
|
|
|
a1c7236 |
char_u *fname;
|
|
|
a1c7236 |
! char_u *ffname;
|
|
|
a1c7236 |
buf_T *buf;
|
|
|
a1c7236 |
char_u *dir_name;
|
|
|
a1c7236 |
{
|
|
|
a1c7236 |
--- 3577,3586 ----
|
|
|
a1c7236 |
* Make swap file name out of the file name and a directory name.
|
|
|
a1c7236 |
* Returns pointer to allocated memory or NULL.
|
|
|
a1c7236 |
*/
|
|
|
a1c7236 |
char_u *
|
|
|
a1c7236 |
makeswapname(fname, ffname, buf, dir_name)
|
|
|
a1c7236 |
char_u *fname;
|
|
|
a1c7236 |
! char_u *ffname UNUSED;
|
|
|
a1c7236 |
buf_T *buf;
|
|
|
a1c7236 |
char_u *dir_name;
|
|
|
a1c7236 |
{
|
|
|
a1c7236 |
*** ../vim-7.2.274/src/version.c 2009-11-03 14:46:35.000000000 +0100
|
|
|
a1c7236 |
--- src/version.c 2009-11-03 15:28:33.000000000 +0100
|
|
|
a1c7236 |
***************
|
|
|
a1c7236 |
*** 678,679 ****
|
|
|
a1c7236 |
--- 678,681 ----
|
|
|
a1c7236 |
{ /* Add new patch number below this line */
|
|
|
a1c7236 |
+ /**/
|
|
|
a1c7236 |
+ 275,
|
|
|
a1c7236 |
/**/
|
|
|
a1c7236 |
|
|
|
a1c7236 |
--
|
|
|
a1c7236 |
BRIDGEKEEPER: What is your favorite colour?
|
|
|
a1c7236 |
GAWAIN: Blue ... No yelloooooww!
|
|
|
a1c7236 |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
a1c7236 |
|
|
|
a1c7236 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
a1c7236 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
a1c7236 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
a1c7236 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|