updated for version 7.3.571

Problem:    Duplicated condition.
Solution:   Remove one. (Dominique Pelle)

diff --git a/src/os_win32.c b/src/os_win32.c
index 371363bf00bc813671a74e584a68113dcdc3a962..c0434dbda4d375577c8e482cc748dc2d767576d4 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -308,7 +308,7 @@ vimLoadLib(char *name)
 # ifndef GETTEXT_DLL
 #  define GETTEXT_DLL "libintl.dll"
 # endif
-/* Dummy funcitons */
+/* Dummy functions */
 static char *null_libintl_gettext(const char *);
 static char *null_libintl_textdomain(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.
  * If time == 0, do not wait 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 */
     ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */
                        NULL,               /* optional buffer */
-                       0,                  /* buffe size */
+                       0,                  /* buffer size */
                        NULL,               /* number of read bytes */
                        &availableBytes,    /* available bytes total */
                        NULL);              /* byteLeft */
 
     repeatCount = 0;
     /* We got real data in the pipe, read it */
-    while (ret != 0 && availableBytes > 0 && availableBytes > 0)
+    while (ret != 0 && availableBytes > 0)
     {
        repeatCount++;
        toRead =
@@ -3638,7 +3638,7 @@ mch_system_piped(char *cmd, int options)
                  NULL,                 /* Process 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
                  // it, the pipes don't work for some reason.
                  TRUE,                 /* Inherit handles, first deactivated,

diff --git a/src/version.c b/src/version.c
index e60a4bed52e56368a51ac823c8b3cbdd7ebd80d3..8c3c8358ccbdbe74335e133bd0c54161a3d15f6f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    571,
 /**/
     570,
 /**/