patch 8.2.0156: various typos in source files and tests

Problem:    Various typos in source files and tests.
Solution:   Fix the typos. (Emir Sari, closes #5532)

diff --git a/Makefile b/Makefile
index 642d25c3a4d99aa19339fafcc07ca41532a0d618..7774b6ed127904294a731494dcc19c71b403f641 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ MINOR = 2
 #   > msvc2015.bat
 # - Build the console binary:
 #   > nmake -f Make_mvc.mak
-# - Run the tests and check the ouput:
+# - Run the tests and check the output:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak test
 # - Rename (using ../tools/rename.bat):

diff --git a/src/INSTALLvms.txt b/src/INSTALLvms.txt
index 7966e6fab05ae7c8c8413e2b12bb346faf2750f2..3e05b53273a702e0ea1999143d4d30536d6cddb8 100644 (file)
--- a/src/INSTALLvms.txt
+++ b/src/INSTALLvms.txt
@@ -198,7 +198,7 @@ from CVS mirror ftp://ftp.polarhome.com/pub/cvs/SOURCE/
      more information can be found in os_vms_fix.com file itself.
 
      NOTE: even if os_vms_fix.com will fix all pre-processor directives it will
-     leave singe (long) line directives. You have to fix them manually.
+     leave single (long) line directives. You have to fix them manually.
      Known problematic files are option.h and option.c
 
 4.2. After the conversion you can continue building as it has been described
@@ -319,7 +319,7 @@ perl_env :
 
      Build it as normally.
 
-     Used sharable images are:
+     Used shareable images are:
        gtk_root:[glib]libglib.exe /share,-
        gtk_root:[glib.gmodule]libgmodule.exe /share,-
        gtk_root:[gtk.gdk]libgdk.exe /share,-

diff --git a/src/Make_vms.mms b/src/Make_vms.mms
index c5af71400c2e144ff37390436ffc269817483ea8..6d5db4b6e38389eabfd57da71c8353f56a7e7eeb 100644 (file)
--- a/src/Make_vms.mms
+++ b/src/Make_vms.mms
@@ -281,7 +281,7 @@ ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
  $(TCL_INC)$(XDIFF_INC)$(XPM_INC))
 
 # CFLAGS displayed in :ver information
-# It is specially formated for correct display of unix like includes
+# It is specially formatted for correct display of unix like includes
 # as $(GUI_INC) - replaced with $(GUI_INC_VER)
 # Otherwise should not be any other difference.
 ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -

diff --git a/src/beval.h b/src/beval.h
index ffe47fffc39eb8f591ec23114008ec3771c4faf8..f44620038d8e59ad1b3611e54f9e064f030a84ea 100644 (file)
--- a/src/beval.h
+++ b/src/beval.h
@@ -38,7 +38,7 @@ typedef struct BalloonEvalStruct
     GtkWidget          *balloonShell;
     GtkWidget          *balloonLabel;
     unsigned int       timerID;        // timer for run
-    BeState            showState;      // tells us whats currently going on
+    BeState            showState;      // tells us what's currently going on
     int                        x;
     int                        y;
     unsigned int       state;          // Button/Modifier key state
@@ -48,7 +48,7 @@ typedef struct BalloonEvalStruct
     Widget             balloonShell;
     Widget             balloonLabel;
     XtIntervalId       timerID;        // timer for run
-    BeState            showState;      // tells us whats currently going on
+    BeState            showState;      // tells us what's currently going on
     XtAppContext       appContext;     // used in event handler
     Position           x;
     Position           y;
@@ -60,7 +60,7 @@ typedef struct BalloonEvalStruct
     HWND               balloon;
     int                        x;
     int                        y;
-    BeState            showState;      // tells us whats currently going on
+    BeState            showState;      // tells us what's currently going on
 #  endif
 # endif
 # if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN)

diff --git a/src/buffer.c b/src/buffer.c
index f56ff0b6259bc639e86ae3237ebf623076888ae6..7ff80977373b579e737a334ffd2191a8841b3729 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1690,7 +1690,7 @@ set_curbuf(buf_T *buf, int action)
     set_bufref(&prevbufref, prevbuf);
     set_bufref(&newbufref, buf);
 
-    // Autocommands may delete the curren buffer and/or the buffer we wan to go
+    // Autocommands may delete the current buffer and/or the buffer we want to go
     // to.  In those cases don't close the buffer.
     if (!apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf)
            || (bufref_valid(&prevbufref)
@@ -1713,6 +1713,7 @@ set_curbuf(buf_T *buf, int action)
 #endif
        {
            win_T  *previouswin = curwin;
+
            if (prevbuf == curbuf)
                u_sync(FALSE);
            close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf,

diff --git a/src/charset.c b/src/charset.c
index 7505fea2e1f1e74ee7fa8ddced04ff14fb0760f2..aa843d111a8deb8ee4f770173dcd9b47e4328951 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1939,7 +1939,7 @@ vim_str2nr(
        }
     }
 
-    // Check for an alpha-numeric character immediately following, that is
+    // Check for an alphanumeric character immediately following, that is
     // most likely a typo.
     if (strict && n - 1 != maxlen && ASCII_ISALNUM(*ptr))
        return;

diff --git a/src/evalvars.c b/src/evalvars.c
index 866682b977c8eb742cbe171160c51dbb5c58312a..38cb457e11cd3e2904b9287f40c37462b0f0d876 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2813,7 +2813,7 @@ set_var_const(
                    char_u *val = tv_get_string(tv);
 
                    // Careful: when assigning to v:errmsg and tv_get_string()
-                   // causes an error message the variable will alrady be set.
+                   // causes an error message the variable will already be set.
                    if (di->di_tv.vval.v_string == NULL)
                        di->di_tv.vval.v_string = vim_strsave(val);
                }

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index c8a93bc0a89e1ae845cb430f593a38fe97d4a63b..881e6f9265b995cee38fb20c149fee4c214b1d8e 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5288,7 +5288,7 @@ check_help_lang(char_u *arg)
  * Return a heuristic indicating how well the given string matches.  The
  * smaller the number, the better the match.  This is the order of priorities,
  * from best match to worst match:
- *     - Match with least alpha-numeric characters is better.
+ *     - Match with least alphanumeric characters is better.
  *     - Match with least total characters is better.
  *     - Match towards the start is better.
  *     - Match starting with "+" is worse (feature instead of command)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index c0ed1c88c686d39bb509d5d410fc013a997ca7d4..6df6975ea137ab149ebd96e5e27065d971c155be 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6134,7 +6134,7 @@ ex_edit(exarg_T *eap)
 }
 
 /*
- * ":edit <file>" command and alikes.
+ * ":edit <file>" command and alike.
  */
     void
 do_exedit(

diff --git a/src/getchar.c b/src/getchar.c
index 72ddbb9ad3a42fc8127ae3ec01b831131e321d4d..d056bcc5d16ec02555413e013ee310ead9cc758a 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3237,7 +3237,7 @@ vgetorpeek(int advance)
  *     1. a scriptfile
  *     2. the keyboard
  *
- *  As much characters as we can get (upto 'maxlen') are put in "buf" and
+ *  As many characters as we can get (up to 'maxlen') are put in "buf" and
  *  NUL terminated (buffer length must be 'maxlen' + 1).
  *  Minimum for "maxlen" is 3!!!!
  *

diff --git a/src/gui.c b/src/gui.c
index eec89d5aa265b0ba1a81e7c475a6878069942568..f1c36f4c4fe517be039814fd5ea9b8da0298f58f 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -3420,7 +3420,7 @@ gui_init_which_components(char_u *oldval UNUSED)
     if (oldval != NULL && gui.in_use)
     {
        /*
-        * Check if the menu's go from grey to non-grey or vise versa.
+        * Check if the menus go from grey to non-grey or vice versa.
         */
        grey_old = (vim_strchr(oldval, GO_GREY) != NULL);
        grey_new = (vim_strchr(p_go, GO_GREY) != NULL);

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 3dfb939e29d1e5b47e96bde602bfe31db2df3db5..875b3ecc13afc0d791eabbb19a6772ccccc53e17 100644 (file)
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -2919,7 +2919,7 @@ gui_mch_prepare(int *argc, char **argv)
 
     (void)FSGetCatalogInfo(&applFSRef, kFSCatInfoNone, NULL, NULL, &applDir, NULL);
 
-    // This technic return NIL when we disallow_gui
+    // This technique returns NIL when we disallow_gui
 # endif
     exe_name = FullPathFromFSSpec_save(applDir);
 #endif

diff --git a/src/gui_photon.c b/src/gui_photon.c
index 963cabc2767bec468b27a74da638bd9ac664776c..1a7288b6d410c5c2c089d015e6dd109fa8be6008 100644 (file)
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -1206,7 +1206,7 @@ gui_mch_init(void)
 
     /*
      * Now that the text area widget has been created, set up the colours,
-     * which wil call PtSetResource from gui_mch_new_colors
+     * which will call PtSetResource from gui_mch_new_colors
      */
 
     /*

diff --git a/src/if_perl.xs b/src/if_perl.xs
index fd9d3d730fbac9ae3cbf79b2613e592b9212109d..12e1a227e181900b90426e347254418e55261941 100644 (file)
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -930,7 +930,7 @@ I32 cur_val(IV iv, SV *sv)
 
     if (SvRV(sv) != SvRV(rv))
        // XXX: This magic variable is a bit confusing...
-       // Is curently refcounted ?
+       // Is currently refcounted ?
        sv_setsv(sv, rv);
 
     SvREFCNT_dec(rv);

diff --git a/src/libvterm/t/11state_movecursor.test b/src/libvterm/t/11state_movecursor.test
index c1d72b2a61dd8fd8bdcb810245278ef4f718e35c..26e447e7c7d16f6dcc52bd5b8a7524bbf758bba6 100644 (file)
--- a/src/libvterm/t/11state_movecursor.test
+++ b/src/libvterm/t/11state_movecursor.test
@@ -112,7 +112,7 @@ PUSH "\e[2F"
 PUSH "\e[0F"
   ?cursor = 0,0
 
-!Cursor Horizonal Absolute
+!Cursor Horizontal Absolute
 PUSH "\n"
   ?cursor = 1,0
 PUSH "\e[20G"

diff --git a/src/libvterm/t/41screen_unicode.test b/src/libvterm/t/41screen_unicode.test
index 79dcb686235bbc5d7bca45dbdafb120a2938752d..6f5602dcf30626c42a287cffec9e1a8af22a7b90 100644 (file)
--- a/src/libvterm/t/41screen_unicode.test
+++ b/src/libvterm/t/41screen_unicode.test
@@ -40,7 +40,7 @@ PUSH "e\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\
 PUSH  "\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81\xCC\x81"
   ?screen_cell 0,0 = {0x65,0x301,0x301,0x301,0x301,0x301} width=1 attrs={} fg=rgb(240,240,240) bg=rgb(0,0,0)
 
-!Outputing CJK doublewidth in 80th column should wraparound to next line and not crash"
+!Outputting CJK doublewidth in 80th column should wraparound to next line and not crash"
 RESET
 PUSH "\e[80G\xEF\xBC\x90"
   ?screen_cell 0,79 = {} width=1 attrs={} fg=rgb(240,240,240) bg=rgb(0,0,0)

diff --git a/src/mbyte.c b/src/mbyte.c
index 5dd256268eab5e2069e1e934920720737477be9a..abb07ae5d977bf2f9200443a748fbbda23de7b54 100644 (file)
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -960,7 +960,7 @@ dbcs_class(unsigned lead, unsigned trail)
                        // special symbols
                        return 10;
                    case 0x23:
-                       // alpha-numeric
+                       // alphanumeric
                        return 11;
                    case 0x24:
                        // hiragana
@@ -994,7 +994,7 @@ dbcs_class(unsigned lead, unsigned trail)
                 * 20 : Hangul
                 * 21 : Hanja
                 * 22 : Symbols
-                * 23 : Alpha-numeric/Roman Letter (Full width)
+                * 23 : Alphanumeric/Roman Letter (Full width)
                 * 24 : Hangul Letter(Alphabet)
                 * 25 : Roman Numeral/Greek Letter
                 * 26 : Box Drawings
@@ -1025,7 +1025,7 @@ dbcs_class(unsigned lead, unsigned trail)
                        // Symbols
                        return 22;
                    case 0xA3:
-                       // Alpha-numeric
+                       // Alphanumeric
                        return 23;
                    case 0xA4:
                        // Hangul Letter(Alphabet)

diff --git a/src/memline.c b/src/memline.c
index aeb8afeaa073945082f0e0c965ef4f79f4baba5e..c6db9136fe9596a2fff7b6477e5cbf2c96ac54aa 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -111,7 +111,7 @@ struct data_block
     unsigned   db_txt_end;     // byte just after data block
     linenr_T   db_line_count;  // number of lines in this block
     unsigned   db_index[1];    // index for start of line (actually bigger)
-                               // followed by empty space upto db_txt_start
+                               // followed by empty space up to db_txt_start
                                // followed by the text in the lines until
                                // end of page
 };

diff --git a/src/normal.c b/src/normal.c
index c4963e62120aadd93fffffe951dc2b1363287a43..512b799a1147b05d139e4be152c3d5e2437badb4 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -5659,7 +5659,7 @@ n_start_visual_mode(int c)
     VIsual_reselect = TRUE;
 
     // Corner case: the 0 position in a tab may change when going into
-    // virtualedit.  Recalculate curwin->w_cursor to avoid bad hilighting.
+    // virtualedit.  Recalculate curwin->w_cursor to avoid bad highlighting.
     if (c == Ctrl_V && (ve_flags & VE_BLOCK) && gchar_cursor() == TAB)
     {
        validate_virtcol();

diff --git a/src/ops.c b/src/ops.c
index b412b8a5bec307959020fb3310d2f0d0859f2c54..6a6abf7837b9c9e223fa3ccf90cc649bd89ac56a 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -314,7 +314,7 @@ shift_block(oparg_T *oap, int amount)
         *  3. Divvy into TABs & spp
         *  4. Construct new string
         */
-       total += bd.pre_whitesp; // all virtual WS upto & incl a split TAB
+       total += bd.pre_whitesp; // all virtual WS up to & incl a split TAB
        ws_vcol = bd.start_vcol - bd.pre_whitesp;
        if (bd.startspaces)
        {

diff --git a/src/option.c b/src/option.c
index e24181af10ee81c293b656b6eebc91a3e45a2290..f02dd26a96bb2c0f0b5adcff9369704ae628ea24 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -3155,7 +3155,7 @@ set_num_option(
 
 #if defined(FEAT_EVAL)
     // Save the global value before changing anything. This is needed as for
-    // a global-only option setting the "local value" infact sets the global
+    // a global-only option setting the "local value" in fact sets the global
     // value (since there is only one value).
     if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0)
        old_global_value = *(long *)get_varp_scope(&(options[opt_idx]),

diff --git a/src/option.h b/src/option.h
index 4ccf22a87d97e42ce48fa2d7825f40c15382a274..8b04d18f36fcc80feac905de4f85660936fe459e 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -1066,7 +1066,7 @@ EXTERN int        p_wb;           // 'writebackup'
 EXTERN long    p_wd;           // 'writedelay'
 
 /*
- * "indir" values for buffer-local opions.
+ * "indir" values for buffer-local options.
  * These need to be defined globally, so that the BV_COUNT can be used with
  * b_p_scriptID[].
  */

diff --git a/src/os_unix.c b/src/os_unix.c
index 5f2ece3dd8eed8676bd2f388d31707f8e09b7572..15d88f9e15a3cf697d07366f5158b937e04cb355 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1931,7 +1931,7 @@ get_x11_thing(
         * keep traversing up the tree until a window with a title/icon is
         * found.
         */
-       // Previously this was only done for xterm and alikes.  I don't see a
+       // Previously this was only done for xterm and alike.  I don't see a
        // reason why it would fail for other terminal emulators.
        // if (term_is_xterm)
        {

diff --git a/src/os_win32.c b/src/os_win32.c
index 844d7941d43c7e12c4e2a0afd54f1be8bd4391ee..6bbd492055039f5f6abf4dd157441a34079a81d6 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -6927,7 +6927,7 @@ myresetstkoflw(void)
        return 0;
     pStackBase = (BYTE*)mbi.AllocationBase;
 
-    // ...and the page thats min_stack_req pages away from stack base; this is
+    // ...and the page that's min_stack_req pages away from stack base; this is
     // the lowest page we could use.
     pLowestPossiblePage = pStackBase + MIN_STACK_WINNT * nPageSize;
 

diff --git a/src/quickfix.c b/src/quickfix.c
index 2e07403a89e26fc89cad47d9c04564eef97ba5ce..868b5d910a3df541469bf4bc96e2190c38d6b372 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2771,7 +2771,7 @@ get_nth_entry(qf_list_T *qfl, int errornr, int *new_qfidx)
 }
 
 /*
- * Get a entry specied by 'errornr' and 'dir' from the current
+ * Get a entry specified by 'errornr' and 'dir' from the current
  * quickfix/location list. 'errornr' specifies the index of the entry and 'dir'
  * specifies the direction (FORWARD/BACKWARD/FORWARD_FILE/BACKWARD_FILE).
  * Returns a pointer to the entry and the index of the new entry is stored in
@@ -6320,7 +6320,7 @@ unload_dummy_buffer(buf_T *buf, char_u *dirname_start)
 
 #if defined(FEAT_EVAL) || defined(PROTO)
 /*
- * Copy the specified quickfix entry items into a new dict and appened the dict
+ * Copy the specified quickfix entry items into a new dict and append the dict
  * to 'list'.  Returns OK on success.
  */
     static int

diff --git a/src/register.c b/src/register.c
index 24e4b992a300c0bc527c84c33bbe76680d290755..69600024641277f9daf737910cdc3b582002a7d0 100644 (file)
--- a/src/register.c
+++ b/src/register.c
@@ -590,7 +590,7 @@ do_execreg(
        if (y_current->y_array == NULL)
            return FAIL;
 
-       // Disallow remaping for ":@r".
+       // Disallow remapping for ":@r".
        remap = colon ? REMAP_NONE : REMAP_YES;
 
        // Insert lines into typeahead buffer, from last one to first one.

diff --git a/src/spell.c b/src/spell.c
index 572f7fbb9c7e27a3d028cf925b937adcaf036168..87c8f8a481970ccdb8ea5ab2d1ad683776eba8e9 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -1786,7 +1786,7 @@ spell_load_cb(char_u *fname, void *cookie)
 count_common_word(
     slang_T    *lp,
     char_u     *word,
-    int                len,        // word length, -1 for upto NUL
+    int                len,        // word length, -1 for up to NUL
     int                count)      // 1 to count once, 10 to init
 {
     hash_T     hash;

diff --git a/src/tag.c b/src/tag.c
index aaf19c97386bdaf07319e0f53653df408563be6e..4c6dadcf21eb9b49788195106eddb7e7665770dd 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -4123,7 +4123,7 @@ tagstack_clear(win_T *wp)
 
 /*
  * Remove the oldest entry from the tag stack and shift the rest of
- * the entires to free up the top of the stack.
+ * the entries to free up the top of the stack.
  */
     static void
 tagstack_shift(win_T *wp)

diff --git a/src/term.c b/src/term.c
index c74c5ba5b87cb0e083cb118c9353547668aff41a..139928683cb0feccaaf339257dbbe307eea185e9 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -146,7 +146,7 @@ static termrequest_T rbm_status = TERMREQUEST_INIT;
 // Request cursor style report:
 static termrequest_T rcs_status = TERMREQUEST_INIT;
 
-// Request windos position report:
+// Request window's position report:
 static termrequest_T winpos_status = TERMREQUEST_INIT;
 
 static termrequest_T *all_termrequests[] = {

diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index f7cfb4e90b4a19e9ac3d96867a808ee8f30c0418..6e4e090f79a842729b6c6e7d6cb2925e5f783c1d 100644 (file)
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -1,7 +1,7 @@
 " Test for breakindent
 "
 " Note: if you get strange failures when adding new tests, it might be that
-" while the test is run, the breakindent cacheing gets in its way.
+" while the test is run, the breakindent caching gets in its way.
 " It helps to change the tabstop setting and force a redraw (e.g. see
 " Test_breakindent08())
 source check.vim

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index dace45b64e361e8a29eaaf66ea8ce491196e5a4d..bd442c2f830e9a44b2eedb1856b97cf55e30e864 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -20,7 +20,7 @@ endif
 
 let s:chopt = {}
 
-" Run "testfunc" after sarting the server and stop the server afterwards.
+" Run "testfunc" after starting the server and stop the server afterwards.
 func s:run_server(testfunc, ...)
   call RunServer('test_channel.py', a:testfunc, a:000)
 endfunc
@@ -425,7 +425,7 @@ func Test_connect_waittime()
 
   " We intend to use a socket that doesn't exist and wait for half a second
   " before giving up.  If the socket does exist it can fail in various ways.
-  " Check for "Connection reset by peer" to avoid flakyness.
+  " Check for "Connection reset by peer" to avoid flakiness.
   let start = reltime()
   try
     let handle = ch_open('localhost:9867', {'waittime': 500})

diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim
index 2d78be1ad94e8a9c990c9bc7c31555a38d53f49f..dfafd017860dad964e2b3b512ff3a0f2afb33994 100644 (file)
--- a/src/testdir/test_cindent.vim
+++ b/src/testdir/test_cindent.vim
@@ -815,7 +815,7 @@ func Test_cindent_1()
         }
      }
 
-  public: // <-- this was incorectly indented before!!
+  public: // <-- this was incorrectly indented before!!
      void testfall();
   protected:
      void testfall();
@@ -1780,7 +1780,7 @@ func Test_cindent_1()
                }
        }
 
-       public: // <-- this was incorectly indented before!!
+       public: // <-- this was incorrectly indented before!!
        void testfall();
        protected:
        void testfall();
@@ -5254,9 +5254,12 @@ endfunc
 " this was going beyond the end of the line.
 func Test_cindent_case()
   new
-  call setline(1, "case x: // x")
+  call setline(1, 'case x: // x')
   set cindent
   norm! f:a:
+  call assert_equal('case x:: // x', getline(1))
+
+  set cindent&
   bwipe!
 endfunc
 

diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
index 6435c86fa4927ba1c065db0634db5eef7efa7608..e66663bf53bdd1eee6101d3222a31bef8f59e847 100644 (file)
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -80,7 +80,7 @@ func Test_digraphs()
   call Put_Dig(".e")
   call Put_Dig("a.") " not defined
   call assert_equal(['ḃ', 'ė', '.'], getline(line('.')-2,line('.')))
-  " Diaresis
+  " Diaeresis
   call Put_Dig("a:")
   call Put_Dig(":u")
   call Put_Dig("b:") " not defined
@@ -285,7 +285,7 @@ func Test_digraphs_option()
   call Put_Dig_BS(".","e")
   call Put_Dig_BS("a",".") " not defined
   call assert_equal(['ḃ', 'ė', '.'], getline(line('.')-2,line('.')))
-  " Diaresis
+  " Diaeresis
   call Put_Dig_BS("a",":")
   call Put_Dig_BS(":","u")
   call Put_Dig_BS("b",":") " not defined

diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 4e29e7fe1019fb65cdf66fd0c89109848437be6b..1a37146cee37a998dd2688c095e989270f5417e5 100644 (file)
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -589,7 +589,7 @@ func Test_edit_CTRL_K()
   call feedkeys("A\<c-x>\<c-k>\<down>\<down>\<down>\<down>\<cr>\<esc>", 'tnix')
   call assert_equal(['AA'], getline(1, '$'))
 
-  " press an unexecpted key after dictionary completion
+  " press an unexpected key after dictionary completion
   %d
   call setline(1, 'A')
   call cursor(1, 1)

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 690ac673c13ff19c86ae6e99580faf7f77e9bd71..61da44d0fe923f640ba4a77a7f1e98b0c25d5d43 100644 (file)
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -10,7 +10,7 @@ if s:python == ''
   throw 'Skipped: python program missing'
 endif
 
-" Run "testfunc" after sarting the server and stop the server afterwards.
+" Run "testfunc" after starting the server and stop the server afterwards.
 func s:run_server(testfunc, ...)
   call RunServer('test_netbeans.py', a:testfunc, a:000)
 endfunc

diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index b7b4281962217b6b0c6f7bf57523d2488b37219b..129b1cfccb2a5cc6111bccaaf2a16b81cfd49349 100644 (file)
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -2629,7 +2629,7 @@ func Test_cwindow_jump()
   call assert_equal('quickfix', getwinvar(1, '&buftype'))
   call assert_equal('quickfix', getwinvar(3, '&buftype'))
 
-  " Jumping to a file from the location list window should find a usuable
+  " Jumping to a file from the location list window should find a usable
   " window by wrapping around the window list.
   enew | only
   call setloclist(0, [], 'f')

diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index b6bce46d4d4dd676cad6e8eb9a00438f19c37a64..45cf02a59c7444c3c59094c97ab934e5ca8725fe 100644 (file)
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -274,7 +274,7 @@ func Test_set_register()
   call setreg('=', 'b', 'a')
   call assert_equal('regwrite', getreg('='))
 
-  " Test for settting a list of lines to special registers
+  " Test for setting a list of lines to special registers
   call setreg('/', [])
   call assert_equal('', @/)
   call setreg('=', [])

diff --git a/src/testdir/test_stat.vim b/src/testdir/test_stat.vim
index c8830d169b2bb536470ef09ebfa9e24b0757d437..ccd595009e04368a3dc8a5079f54651f1a33798b 100644 (file)
--- a/src/testdir/test_stat.vim
+++ b/src/testdir/test_stat.vim
@@ -5,7 +5,7 @@ func CheckFileTime(doSleep)
   let times = []
   let result = 0
 
-  " Use three files istead of localtim(), with a network filesystem the file
+  " Use three files instead of localtim(), with a network filesystem the file
   " times may differ at bit
   let fl = ['Hello World!']
   for fname in fnames

diff --git a/src/ui.c b/src/ui.c
index 151857f6f4ae1c7538acfd093f6ec9fd16e64645..393bf91f294c4052e61d0f9403138f6e41a29671 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -1500,7 +1500,7 @@ clip_invert_area(
            row2--;
        }
 
-       // Handle the rectangle thats left
+       // Handle the rectangle that's left
        if (row2 >= row1)
            clip_invert_rectangle(cbd, row1, 0, row2 - row1 + 1,
                                                         (int)Columns, invert);

diff --git a/src/version.c b/src/version.c
index dc531be7df74bfc78ac4e51a9bd1f2ffac97ae11..ed71960ab4d00077c3af4dbdafbc1ffb410d951d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    156,
 /**/
     155,
 /**/

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index f2192cf0d93298ee2e0b3528642238428901a133..20a7ad7481cb043082c32edd07c71a4e064de5a9 100644 (file)
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -35,7 +35,7 @@
  *         xxdline().
  *  7.06.96 -i printed 'int' instead of 'char'. *blush*
  *         added Bram's OS2 ifdefs...
- * 18.07.96 gcc -Wall @ SunOS4 is now slient.
+ * 18.07.96 gcc -Wall @ SunOS4 is now silent.
  *         Added osver for MSDOS/DJGPP/WIN32.
  * 29.08.96 Added size_t to strncmp() for Amiga.
  * 24.03.97 Windows NT support (Phil Hanna). Clean exit for Amiga WB (Bram)