# HG changeset patch # User Christian Brabandt # Date 1480621504 -3600 # Node ID f54e4c691de4aba60f68245d5c9657fc32284d61 # Parent fed4e956f53032f2ee0ed9ff50ed8a2f2331eb38 commit https://github.com/vim/vim/commit/b04a98f6c3cca14bf055934b0a793f4dc376858b Author: Bram Moolenaar Date: Thu Dec 1 20:32:29 2016 +0100 patch 8.0.0114 Problem: Coding style not optimal. Solution: Add spaces. (Ken Takata) diff --git a/src/gui_w32.c b/src/gui_w32.c --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -3551,12 +3551,12 @@ gui_mch_browseW( filterp = convert_filterW(filter); vim_memset(&fileStruct, 0, sizeof(OPENFILENAMEW)); -#ifdef OPENFILENAME_SIZE_VERSION_400W +# ifdef OPENFILENAME_SIZE_VERSION_400W /* be compatible with Windows NT 4.0 */ fileStruct.lStructSize = OPENFILENAME_SIZE_VERSION_400W; -#else +# else fileStruct.lStructSize = sizeof(fileStruct); -#endif +# endif if (title != NULL) titlep = enc_to_utf16(title, NULL); @@ -3593,10 +3593,10 @@ gui_mch_browseW( * Don't use OFN_OVERWRITEPROMPT, Vim has its own ":confirm" dialog. */ fileStruct.Flags = (OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY); -#ifdef FEAT_SHORTCUT +# ifdef FEAT_SHORTCUT if (curbuf->b_p_bin) fileStruct.Flags |= OFN_NODEREFERENCELINKS; -#endif +# endif if (saving) { if (!GetSaveFileNameW(&fileStruct)) diff --git a/src/os_mswin.c b/src/os_mswin.c --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -40,7 +40,7 @@ # include # include # include -#endif +# endif #endif /* PROTO */ @@ -1619,7 +1619,9 @@ mch_print_init(prt_settings_T *psettings if (psettings->n_uncollated_copies == 0) psettings->n_uncollated_copies = 1; - } else { + } + else + { psettings->n_collated_copies = 1; psettings->n_uncollated_copies = 1; } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 114, +/**/ 113, /**/ 112,