thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.571

Browse Source 
Problem:    Duplicated condition.
Solution:   Remove one. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2012-06-29 13:14:03 +02:00
parent 8f5c6f003a
commit f6a2b08c54
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os_win32.c
View File

@@ -308,7 +308,7 @@ vimLoadLib(char *name)
# ifndef GETTEXT_DLL # ifndef GETTEXT_DLL
# define GETTEXT_DLL "libintl.dll" # define GETTEXT_DLL "libintl.dll"
# endif # endif
/* Dummy funcitons */ /* Dummy functions */
static char *null_libintl_gettext(const char *); static char *null_libintl_gettext(const char *);
static char *null_libintl_textdomain(const char *); static char *null_libintl_textdomain(const char *);
static char *null_libintl_bindtextdomain(const char *, const char *); static char *null_libintl_bindtextdomain(const char *, const char *);
@@ -1409,7 +1409,7 @@ tgetch(int *pmodifiers, char_u *pch2)
/* /*
* mch_inchar(): low-level input funcion. * mch_inchar(): low-level input function.
* Get one or more characters from the keyboard or the mouse. * Get one or more characters from the keyboard or the mouse.
* If time == 0, do not wait for characters. * If time == 0, do not wait for characters.
* If time == n, wait a short time for characters. * If time == n, wait a short time for characters.
@@ -3451,14 +3451,14 @@ dump_pipe(int options,
* to avoid to perform a blocking read */ * to avoid to perform a blocking read */
ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */ ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */
NULL, /* optional buffer */ NULL, /* optional buffer */
0, /* buffe size */ 0, /* buffer size */
NULL, /* number of read bytes */ NULL, /* number of read bytes */
&availableBytes, /* available bytes total */ &availableBytes, /* available bytes total */
NULL); /* byteLeft */ NULL); /* byteLeft */
repeatCount = 0; repeatCount = 0;
/* We got real data in the pipe, read it */ /* We got real data in the pipe, read it */
while (ret != 0 && availableBytes > 0 && availableBytes > 0) while (ret != 0 && availableBytes > 0)
{ {
repeatCount++; repeatCount++;
toRead = toRead =
@@ -3638,7 +3638,7 @@ mch_system_piped(char *cmd, int options)
NULL, /* Process security attributes */ NULL, /* Process security attributes */
NULL, /* Thread security attributes */ NULL, /* Thread security attributes */
// this command can be litigeous, handle inheritence was // this command can be litigious, handle inheritance was
// deactivated for pending temp file, but, if we deactivate // deactivated for pending temp file, but, if we deactivate
// it, the pipes don't work for some reason. // it, the pipes don't work for some reason.
TRUE, /* Inherit handles, first deactivated, TRUE, /* Inherit handles, first deactivated,

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
571,
/**/ /**/
570, 570,
/**/ /**/