patch 9.0.1453: typos in source code and tests

Problem:    Typos in source code and tests.
Solution:   Fi the typos. (Dominique Pellé, closes #12217)

diff --git a/src/feature.h b/src/feature.h
index ad61cb92294d6c39a2e8221bac1c267acc740ec2..24c84488cf4515650011f1c62a5cb23aeef75ece 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -823,10 +823,10 @@
  * +mouse_gpm          Unix only: Include code for Linux console mouse
  *                     handling.
  * +mouse_pterm                PTerm mouse support for QNX
- * +mouse_sgr          Unix only: Include code for for SGR-styled mouse.
+ * +mouse_sgr          Unix only: Include code for SGR-styled mouse.
  * +mouse_sysmouse     Unix only: Include code for FreeBSD and DragonFly
  *                     console mouse handling.
- * +mouse_urxvt                Unix only: Include code for for urxvt mouse handling.
+ * +mouse_urxvt                Unix only: Include code for urxvt mouse handling.
  * +mouse              Any mouse support (any of the above enabled).
  *                     Always included, since either FEAT_MOUSE_XTERM or
  *                     DOS_MOUSE is defined.

diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc
index 78a444a914aa3f92334931dc2bb2d47c0dfe4e0a..6b035a5d2c64b5aa0a35b9e243f31c12a9d8b8a3 100644 (file)
--- a/src/gui_haiku.cc
+++ b/src/gui_haiku.cc
@@ -4518,7 +4518,7 @@ gui_mch_add_menu(
            //  when we add a BMenu to another Menu, it creates the interconnecting BMenuItem
            tmp->AddItem(bmenu);
 
-           //  Now its safe to query the menu for the associated MenuItem....
+           //  Now it's safe to query the menu for the associated MenuItem...
            menu->id = tmp->FindItem((const char *) menu->dname);
 
        }

diff --git a/src/if_ole.cpp b/src/if_ole.cpp
index 9dc15fda2793c4ec651a490b7708812ddf3fbc63..f347387a9015c46d4023ab1d9f9cb4b514ff1a9b 100644 (file)
--- a/src/if_ole.cpp
+++ b/src/if_ole.cpp
@@ -334,7 +334,7 @@ CVim::SendKeys(BSTR keys)
     /* Reject strings too long to fit in the input buffer. Allow 10 bytes
      * space to cover for the (remote) possibility that characters may enter
      * the input buffer between now and when the WM_OLE message is actually
-     * processed. If more that 10 characters enter the input buffer in that
+     * processed. If more than 10 characters enter the input buffer in that
      * time, the WM_OLE processing will simply fail to insert the characters.
      */
     if ((int)(STRLEN(str)) > (vim_free_in_input_buf() - 10))

diff --git a/src/logfile.c b/src/logfile.c
index 673468ebad1ad3b0d87cbc8562c211c5a1b4804d..999acf03f66af7a46d515dbd0d7db610f65e0cb5 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -9,7 +9,7 @@
 /*
  * Implements logging.  Originally intended for the channel feature, which is
  * why the "ch_" prefix is used.  Also useful for any kind of low-level and
- * async debuging.
+ * async debugging.
  */
 
 #include "vim.h"

diff --git a/src/os_mac.h b/src/os_mac.h
index 2b5cbe45727b2d231d25d869191ea6ca489bc20e..17e94784c4bc3855fb5d2a2727fd9e66a5fccbc7 100644 (file)
--- a/src/os_mac.h
+++ b/src/os_mac.h
@@ -28,7 +28,7 @@
  */
 #if defined(__APPLE_CC__) // for Project Builder and ...
 # include <unistd.h>
-// Get stat.h or something similar. Comment: How come some OS get in in vim.h
+// Get stat.h or something similar. Comment: How come some OS get in vim.h
 # include <sys/stat.h>
 // && defined(HAVE_CURSE)
 // The curses.h from MacOS X provides by default some BACKWARD compatibility

diff --git a/src/structs.h b/src/structs.h
index 3c52a639712f91349031ac2a442b1137101329ac..79c4ac695388858eed7aef910e2e03af81391903 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1993,7 +1993,7 @@ typedef struct {
 
 /*
  * Info about an encountered script.
- * When sn_state has the SN_STATE_NOT_LOADED is has not been sourced yet.
+ * When sn_state has SN_STATE_NOT_LOADED, it has not been sourced yet.
  */
 typedef struct
 {
@@ -4780,7 +4780,7 @@ typedef struct {
     int                cts_text_prop_count;    // number of text props; when zero
                                        // cts_text_props is not used
     textprop_T *cts_text_props;        // text props (allocated)
-    char       cts_has_prop_with_text; // TRUE if if a property inserts text
+    char       cts_has_prop_with_text; // TRUE if a property inserts text
     int                cts_cur_text_width;     // width of current inserted text
     int                cts_prop_lines;         // nr of properties above or below
     int                cts_first_char;         // width text props above the line

diff --git a/src/termdefs.h b/src/termdefs.h
index 02399653144a108ca8c4ac670f4ce18114a5d913..9f72dc1c5369c0354e7ad4c6a6e19fbd721c04cf 100644 (file)
--- a/src/termdefs.h
+++ b/src/termdefs.h
@@ -14,8 +14,8 @@
 
 #if defined(SASC) && SASC < 658
 /*
- * The SAS C compiler has a bug that makes typedefs being forgot in include
- * files.  Has been fixed in version 6.58.
+ * The SAS C compiler has a bug that makes typedefs being forgotten
+ * in include files.  Has been fixed in version 6.58.
  */
 typedef unsigned char char_u;
 #endif

diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
index 124735968713c3c85ff76ad70533fe013d0fa830..9929dd5e742c45371fa824b3feded1508df73871 100644 (file)
--- a/src/testdir/test_menu.vim
+++ b/src/testdir/test_menu.vim
@@ -162,7 +162,7 @@ endfunc
 
 " Test for menu item completion in command line
 func Test_menu_expand()
-  " Create the menu itmes for test
+  " Create the menu items for test
   menu Dummy.Nothing lll
   for i in range(1, 4)
     let m = 'menu Xmenu.A' .. i .. '.A' .. i

diff --git a/src/testdir/test_mswin_event.vim b/src/testdir/test_mswin_event.vim
index e2add3b2c228e8f8e9e235c92c6cab22a45aca32..4de016953e104ab9fed2fce042c0930ecbb87e21 100644 (file)
--- a/src/testdir/test_mswin_event.vim
+++ b/src/testdir/test_mswin_event.vim
@@ -6,7 +6,7 @@ CheckMSWindows
 source mouse.vim
 
 " Helper function for sending a grouped sequence of low level key presses
-" The modifer key(s) can be included as VK Key Codes in the sequence
+" The modifier key(s) can be included as VK Key Codes in the sequence
 " Keydown events will be sent, to to the end of the group, then keyup events
 " will be sent in reverse order to release the keys.
 func SendKeyGroup(keygroup)
@@ -19,7 +19,7 @@ func SendKeyGroup(keygroup)
 endfunc
 
 " Send individual key press and release events.
-" the modifers for the key press can be specified in the modifiers arg.
+" the modifiers for the key press can be specified in the modifiers arg.
 func SendKeyWithModifiers(key, modifiers)
   let args = { }
   let args.keycode = a:key
@@ -359,7 +359,7 @@ func s:LoopTestKeyArray(arr)
     " and when the virtual termcap maps the character
     call assert_equal(0, mod_mask, $"key = {kstr}")
 
-    " Send as a single key press with a modifers mask.
+    " Send as a single key press with a modifiers mask.
     let modifiers = 0
     let key = kcodes[0]
     for key in kcodes

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index cd141eb6a08f41c84a4d6df4082f077dd84a9806..3d196d9e13001c38170766f7bbbf018c8e098cce 100644 (file)
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -1570,7 +1570,7 @@ func Test_proptype_substitute_join()
   call prop_add(2, 7, {'length': 2, 'type': 'number'})
   call prop_add(3, 6, {'length': 2, 'type': 'number'})
   call prop_add(4, 7, {'length': 2, 'type': 'number'})
-  " The highlighted "is" in line 1, 2 and 4 is kept and ajudsted.
+  " The highlighted "is" in line 1, 2 and 4 is kept and adjusted.
   " The highlighted "is" in line 3 is deleted.
   let expected = [
         \ #{type_bufnr: 0, id: 0, col: 6, end: 1, type: 'number', length: 2, start: 1},

diff --git a/src/version.c b/src/version.c
index 6bbf3d0a36a67db15967c96d66f852e6ab74cfb6..792fc8e3f4834c3adc9e1bc8243ffe51f2c5f120 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1453,
 /**/
     1452,
 /**/