diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-06-29 13:14:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-06-29 13:14:03 +0200 |
| commit | 1570c8ef507a9e6808673e8b709ecf75fed8147f (patch) | |
| tree | 780b00672537f8937d50aa4c1c3f2ce1ff50c496 | |
| parent | 2ac973e8e2e98b7c9d5f5bf4b35258f0be1a543a (diff) | |
| download | vim-1570c8ef507a9e6808673e8b709ecf75fed8147f.tar.gz | |
Problem: Duplicated condition.
Solution: Remove one. (Dominique Pelle)
| -rw-r--r-- | src/os_win32.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 371363bf..c0434dbd 100644 --- 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 e60a4bed..8c3c8358 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 571, +/**/ 570, /**/ 569, |