summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-10-20 18:24:22 +0200
committerBram Moolenaar <Bram@vim.org>2011-10-20 18:24:22 +0200
commit62dbdc4a5ae16900d17473dbfe3be3acea321bf0 (patch)
tree0b6ee730812c90da066596f30b1a503ff5798762
parent667b4d2db96fbdb8d19d413138ce45d56bccbe0f (diff)
downloadvim-git-7.3.342.tar.gz
updated for version 7.3.342v7.3.342
Problem: Code not in Vim style. Solution: Fix the style. (Elias Diem)
-rw-r--r--src/os_amiga.c2
-rw-r--r--src/os_mac_conv.c2
-rw-r--r--src/os_win16.c4
-rw-r--r--src/version.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/os_amiga.c b/src/os_amiga.c
index 3c96e64fd..d84af4ce1 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -1022,7 +1022,7 @@ mch_get_shellsize()
/* insure longword alignment */
#ifdef __amigaos4__
- if(!(id = AllocDosObject(DOS_INFODATA, 0)))
+ if (!(id = AllocDosObject(DOS_INFODATA, 0)))
goto out;
#else
id = (struct InfoData *)(((long)id_a + 3L) & ~3L);
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 71960daa5..2c4038ef1 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -77,7 +77,7 @@ mac_string_convert(ptr, len, lenp, fail_on_error, from_enc, to_enc, unconvlenp)
*unconvlenp = 0;
cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
- if(cfstr == NULL)
+ if (cfstr == NULL)
fprintf(stderr, "Encoding failed\n");
/* When conversion failed, try excluding bytes from the end, helps when
* there is an incomplete byte sequence. Only do up to 6 bytes to avoid
diff --git a/src/os_win16.c b/src/os_win16.c
index c4d9cfc88..0be6c6316 100644
--- a/src/os_win16.c
+++ b/src/os_win16.c
@@ -243,9 +243,9 @@ mch_system(char *cmd, int options)
/* Wait for the command to terminate before continuing */
while (GetModuleUsage((HINSTANCE)h_module) > 0 && again )
{
- while( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) && again )
+ while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) && again)
{
- if(msg.message == WM_QUIT)
+ if (msg.message == WM_QUIT)
{
PostQuitMessage(msg.wParam);
diff --git a/src/version.c b/src/version.c
index 3c4dc11c4..260378d67 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 342,
+/**/
341,
/**/
340,