patch 8.2.4945: inconsistent use of white space

Problem:    Inconsistent use of white space.
Solution:   Use Tabs and Spaces consistently.

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 84afc15f5930a8e74b60be43316befa070b62ce1..0d0a5cef29716288911e32846ee32f871b548ddf 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -6954,7 +6954,7 @@ populate_module(PyObject *m)
     {
        // find_module() is deprecated, this may stop working in some later
        // version.
-        ADD_OBJECT(m, "_find_module", py_find_module);
+       ADD_OBJECT(m, "_find_module", py_find_module);
     }
 
     Py_DECREF(imp);

diff --git a/src/os_amiga.c b/src/os_amiga.c
index 6717f0b1835df1ba0dd93ca1c1169340aafbcb0d..0e5c7146b2a636d068c4d336fd9f8ad64bea8c4b 100644 (file)
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -677,8 +677,8 @@ mch_get_user_name(char_u *s, int len)
 
     if (pwd != NULL && pwd->pw_name && len > 0)
     {
-        vim_strncpy(s, (char_u *)pwd->pw_name, len - 1);
-        return OK;
+       vim_strncpy(s, (char_u *)pwd->pw_name, len - 1);
+       return OK;
     }
 #endif
     *s = NUL;
@@ -897,17 +897,17 @@ mch_can_exe(char_u *name, char_u **path UNUSED, int use_path)
     BPTR seg = LoadSeg(name);
 
     if (seg && GetSegListInfoTags(seg, GSLI_Native, NULL, TAG_DONE) !=
-        GetSegListInfoTags(seg, GSLI_68KHUNK, NULL, TAG_DONE))
+           GetSegListInfoTags(seg, GSLI_68KHUNK, NULL, TAG_DONE))
     {
-        // Test if file permissions allow execution.
-        struct ExamineData *exd = ExamineObjectTags(EX_StringNameInput, name);
+       // Test if file permissions allow execution.
+       struct ExamineData *exd = ExamineObjectTags(EX_StringNameInput, name);
 
-        exe = (exd && !(exd->Protection & EXDF_NO_EXECUTE)) ? 1 : 0;
-        FreeDosObject(DOS_EXAMINEDATA, exd);
+       exe = (exd && !(exd->Protection & EXDF_NO_EXECUTE)) ? 1 : 0;
+       FreeDosObject(DOS_EXAMINEDATA, exd);
     }
     else
     {
-        exe = 0;
+       exe = 0;
     }
 
     UnLoadSeg(seg);
@@ -915,21 +915,21 @@ mch_can_exe(char_u *name, char_u **path UNUSED, int use_path)
     // Search for executable in path if applicable.
     if (!exe && use_path)
     {
-        // Save current working dir.
-        BPTR cwd = GetCurrentDir();
-        struct PathNode *head = DupCmdPathList(NULL);
-
-        // For each entry, recur to check for executable.
-        for(struct PathNode *tail = head; !exe && tail;
-            tail = (struct PathNode *) BADDR(tail->pn_Next))
-        {
-            SetCurrentDir(tail->pn_Lock);
-            exe = mch_can_exe(name, path, 0);
-        }
-
-        // Go back to where we were.
-        FreeCmdPathList(head);
-        SetCurrentDir(cwd);
+       // Save current working dir.
+       BPTR cwd = GetCurrentDir();
+       struct PathNode *head = DupCmdPathList(NULL);
+
+       // For each entry, recur to check for executable.
+       for(struct PathNode *tail = head; !exe && tail;
+               tail = (struct PathNode *) BADDR(tail->pn_Next))
+       {
+           SetCurrentDir(tail->pn_Lock);
+           exe = mch_can_exe(name, path, 0);
+       }
+
+       // Go back to where we were.
+       FreeCmdPathList(head);
+       SetCurrentDir(cwd);
     }
 #endif
     return exe;
@@ -1052,38 +1052,38 @@ mch_settmode(tmode_T tmode)
 mch_get_shellsize(void)
 {
     if (!term_console)
-        return FAIL;
+       return FAIL;
 
     if (raw_in && raw_out)
     {
-        // Save current console mode.
-        int old_tmode = cur_tmode;
-        char ctrl[] = "\x9b""0 q";
-
-        // Set RAW mode.
-        mch_settmode(TMODE_RAW);
-
-        // Write control sequence to console.
-        if (Write(raw_out, ctrl, sizeof(ctrl)) == sizeof(ctrl))
-        {
-            char scan[] = "\x9b""1;1;%d;%d r",
-                 answ[sizeof(scan) + 8] = { '\0' };
-
-            // Read return sequence from input.
-            if (Read(raw_in, answ, sizeof(answ) - 1) > 0)
-            {
-                // Parse result and set Vim globals.
-                if (sscanf(answ, scan, &Rows, &Columns) == 2)
-                {
-                    // Restore console mode.
-                    mch_settmode(old_tmode);
-                    return OK;
-                }
-            }
-        }
-
-        // Restore console mode.
-        mch_settmode(old_tmode);
+       // Save current console mode.
+       int old_tmode = cur_tmode;
+       char ctrl[] = "\x9b""0 q";
+
+       // Set RAW mode.
+       mch_settmode(TMODE_RAW);
+
+       // Write control sequence to console.
+       if (Write(raw_out, ctrl, sizeof(ctrl)) == sizeof(ctrl))
+       {
+           char scan[] = "\x9b""1;1;%d;%d r",
+                answ[sizeof(scan) + 8] = { '\0' };
+
+           // Read return sequence from input.
+           if (Read(raw_in, answ, sizeof(answ) - 1) > 0)
+           {
+               // Parse result and set Vim globals.
+               if (sscanf(answ, scan, &Rows, &Columns) == 2)
+               {
+                   // Restore console mode.
+                   mch_settmode(old_tmode);
+                   return OK;
+               }
+           }
+       }
+
+       // Restore console mode.
+       mch_settmode(old_tmode);
     }
 
     // I/O error. Default size fallback.

diff --git a/src/os_mswin.c b/src/os_mswin.c
index fb9a3beb3c856e937d84e3a209ca86679ca8d32f..6310a1aaf1a1b0d13b00aa731e8d74dd4a30aece 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -515,13 +515,13 @@ wstat_symlink_aware(const WCHAR *name, stat_T *stp)
     char_u *
 resolve_appexeclink(char_u *fname)
 {
-    DWORD              attr = 0;
-    int                        idx;
-    WCHAR              *p, *end, *wname;
+    DWORD              attr = 0;
+    int                        idx;
+    WCHAR              *p, *end, *wname;
     // The buffer size is arbitrarily chosen to be "big enough" (TM), the
     // ceiling should be around 16k.
-    char_u             buf[4096];
-    DWORD              buf_len = sizeof(buf);
+    char_u             buf[4096];
+    DWORD              buf_len = sizeof(buf);
     REPARSE_DATA_BUFFER *rb = (REPARSE_DATA_BUFFER *)buf;
 
     wname = enc_to_utf16(fname, NULL);

diff --git a/src/os_vms.c b/src/os_vms.c
index 6dc6ad41164908861a8df1a8e21c0dc2afc92fa0..afecc3593e081d643a18bda61c65e2257a57424b 100644 (file)
--- a/src/os_vms.c
+++ b/src/os_vms.c
@@ -672,7 +672,7 @@ vms_fixfilename(void *instring)
     else if (strchr(instring,'"') == NULL)     // password in the path?
     {
        // Seems it is a regular file, let guess that it is pure Unix fspec
-        if ( (strchr(instring,'[') == NULL) && (strchr(instring,'<') == NULL) &&
+       if ( (strchr(instring,'[') == NULL) && (strchr(instring,'<') == NULL) &&
             (strchr(instring,']') == NULL) && (strchr(instring,'>') == NULL) &&
             (strchr(instring,':') == NULL) )
        {

diff --git a/src/os_vms_conf.h b/src/os_vms_conf.h
index df03b15047e1c9141dd461843e5959bb07fb8552..64f5d6d43fead2473e5263596186d5f9b9f5ae7e 100644 (file)
--- a/src/os_vms_conf.h
+++ b/src/os_vms_conf.h
@@ -208,7 +208,7 @@
 
 // GUI support defines
 #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK)
-#define X_INCLUDE_GRP_H             // To use getgrgid
+#define X_INCLUDE_GRP_H                // To use getgrgid
 #define XUSE_MTSAFE_API
 #define HAVE_X11
 #define WANT_X11

diff --git a/src/os_win32.c b/src/os_win32.c
index 7cb45d557ce2c5f6c7e35fc2d47707ec9a8990bf..59072c49bbfe5f613ac420af3bab1e676e3b1ead 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1200,8 +1200,8 @@ static int g_fMouseActive = FALSE;  // mouse enabled
 static int g_nMouseClick = -1;     // mouse status
 static int g_xMouse;               // mouse x coordinate
 static int g_yMouse;               // mouse y coordinate
-static DWORD g_cmodein = 0;         // Original console input mode
-static DWORD g_cmodeout = 0;        // Original console output mode
+static DWORD g_cmodein = 0;        // Original console input mode
+static DWORD g_cmodeout = 0;       // Original console output mode
 
 /*
  * Enable or disable mouse input
@@ -1925,7 +1925,7 @@ mch_inchar(
     // to get and still room in the buffer (up to two bytes for a char and
     // three bytes for a modifier).
     while ((typeaheadlen == 0 || WaitForChar(0L, FALSE))
-                        && typeaheadlen + 5 + TYPEAHEADSPACE <= TYPEAHEADLEN)
+                         && typeaheadlen + 5 + TYPEAHEADSPACE <= TYPEAHEADLEN)
     {
        if (typebuf_changed(tb_change_cnt))
        {
@@ -6615,7 +6615,7 @@ mch_write(
                    p = sp;
 
                // If restoreFG and FG are connected, the restoreFG can be
-               // omitted.
+               // omitted.
                if (sgrn2((sp = sgrnc(p, 39)), 38))
                    p = sp;
 
@@ -7337,10 +7337,10 @@ typedef NTSTATUS (NTAPI *PfnNtOpenFile)(
 typedef NTSTATUS (NTAPI *PfnNtClose)(
        HANDLE Handle);
 typedef NTSTATUS (NTAPI *PfnNtSetEaFile)(
-       HANDLE           FileHandle,
-       PIO_STATUS_BLOCK IoStatusBlock,
-       PVOID            Buffer,
-       ULONG            Length);
+       HANDLE              FileHandle,
+       PIO_STATUS_BLOCK    IoStatusBlock,
+       PVOID               Buffer,
+       ULONG               Length);
 typedef NTSTATUS (NTAPI *PfnNtQueryEaFile)(
        HANDLE FileHandle,
        PIO_STATUS_BLOCK IoStatusBlock,
@@ -7352,10 +7352,10 @@ typedef NTSTATUS (NTAPI *PfnNtQueryEaFile)(
        PULONG EaIndex,
        BOOLEAN RestartScan);
 typedef NTSTATUS (NTAPI *PfnNtQueryInformationFile)(
-       HANDLE                 FileHandle,
-       PIO_STATUS_BLOCK       IoStatusBlock,
-       PVOID                  FileInformation,
-       ULONG                  Length,
+       HANDLE                  FileHandle,
+       PIO_STATUS_BLOCK        IoStatusBlock,
+       PVOID                   FileInformation,
+       ULONG                   Length,
        FILE_INFORMATION_CLASS FileInformationClass);
 typedef VOID (NTAPI *PfnRtlInitUnicodeString)(
        PUNICODE_STRING DestinationString,

diff --git a/src/version.c b/src/version.c
index e2b8c348f98b7606c7cc51b3273ddae9ad54ff2e..45f0f28601ba2e10d956debec0f022e8e2d81f6b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4945,
 /**/
     4944,
 /**/