diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-12-01 20:32:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-12-01 20:32:29 +0100 |
| commit | b04a98f6c3cca14bf055934b0a793f4dc376858b (patch) | |
| tree | 1c7a13b04219d7477dcdcb8dbd7f56bbce2485c2 | |
| parent | 87f3d202a90bd2d08a7afd55b3486b10bef858bb (diff) | |
| download | vim-git-b04a98f6c3cca14bf055934b0a793f4dc376858b.tar.gz | |
patch 8.0.0114v8.0.0114
Problem: Coding style not optimal.
Solution: Add spaces. (Ken Takata)
| -rw-r--r-- | src/gui_w32.c | 10 | ||||
| -rw-r--r-- | src/os_mswin.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 84a23787a..eae37bf4d 100644 --- 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 index dc5538947..408438ed7 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -40,7 +40,7 @@ # include <dlgs.h> # include <winspool.h> # include <commdlg.h> -#endif +# endif #endif /* PROTO */ @@ -1619,7 +1619,9 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit) 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 index df3264417..7b11a557b 100644 --- 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, |