0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

patch 8.0.0114

Problem:    Coding style not optimal.
Solution:   Add spaces. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2016-12-01 20:32:29 +01:00
parent 87f3d202a9
commit b04a98f6c3
3 changed files with 11 additions and 7 deletions

View File

@@ -3551,12 +3551,12 @@ gui_mch_browseW(
filterp = convert_filterW(filter); filterp = convert_filterW(filter);
vim_memset(&fileStruct, 0, sizeof(OPENFILENAMEW)); vim_memset(&fileStruct, 0, sizeof(OPENFILENAMEW));
#ifdef OPENFILENAME_SIZE_VERSION_400W # ifdef OPENFILENAME_SIZE_VERSION_400W
/* be compatible with Windows NT 4.0 */ /* be compatible with Windows NT 4.0 */
fileStruct.lStructSize = OPENFILENAME_SIZE_VERSION_400W; fileStruct.lStructSize = OPENFILENAME_SIZE_VERSION_400W;
#else # else
fileStruct.lStructSize = sizeof(fileStruct); fileStruct.lStructSize = sizeof(fileStruct);
#endif # endif
if (title != NULL) if (title != NULL)
titlep = enc_to_utf16(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. * Don't use OFN_OVERWRITEPROMPT, Vim has its own ":confirm" dialog.
*/ */
fileStruct.Flags = (OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY); fileStruct.Flags = (OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY);
#ifdef FEAT_SHORTCUT # ifdef FEAT_SHORTCUT
if (curbuf->b_p_bin) if (curbuf->b_p_bin)
fileStruct.Flags |= OFN_NODEREFERENCELINKS; fileStruct.Flags |= OFN_NODEREFERENCELINKS;
#endif # endif
if (saving) if (saving)
{ {
if (!GetSaveFileNameW(&fileStruct)) if (!GetSaveFileNameW(&fileStruct))

View File

@@ -40,7 +40,7 @@
# include <dlgs.h> # include <dlgs.h>
# include <winspool.h> # include <winspool.h>
# include <commdlg.h> # include <commdlg.h>
#endif # endif
#endif /* PROTO */ #endif /* PROTO */
@@ -1619,7 +1619,9 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
if (psettings->n_uncollated_copies == 0) if (psettings->n_uncollated_copies == 0)
psettings->n_uncollated_copies = 1; psettings->n_uncollated_copies = 1;
} else { }
else
{
psettings->n_collated_copies = 1; psettings->n_collated_copies = 1;
psettings->n_uncollated_copies = 1; psettings->n_uncollated_copies = 1;
} }

View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
114,
/**/ /**/
113, 113,
/**/ /**/