]> granicus.if.org Git - vim/commitdiff
patch 8.0.0114 v8.0.0114
authorBram Moolenaar <Bram@vim.org>
Thu, 1 Dec 2016 19:32:29 +0000 (20:32 +0100)
committerBram Moolenaar <Bram@vim.org>
Thu, 1 Dec 2016 19:32:29 +0000 (20:32 +0100)
Problem:    Coding style not optimal.
Solution:   Add spaces. (Ken Takata)

src/gui_w32.c
src/os_mswin.c
src/version.c

index 84a23787a3fff11e4a753eb7ea734ad3e964014a..eae37bf4d9dd1cb0fbce7498fbad790206f856c1 100644 (file)
@@ -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))
index dc55389475f4da51d4a8853360c31b2cc041ec8a..408438ed7458723e4195f31922a63db78185f262 100644 (file)
@@ -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;
     }
index df32644178d6c76beee1422c8e606663d8bca46f..7b11a557be24274d9e30d69b2f36be6c18662130 100644 (file)
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    114,
 /**/
     113,
 /**/