Merge remote-tracking branch 'vim/master'

Author: ychin

src/GvimExt/Make_ming.mak

@@ -3,7 +3,7 @@
 # To be used with MingW and Cygwin.
 #
 # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000
-# Now it is allocated dymanically by the linker by evaluating all DLLs
+# Now it is allocated dynamically by the linker by evaluating all DLLs
 # already loaded in memory. The binary image contains as well information
 # for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29
 

src/INSTALLpc.txt

@@ -72,7 +72,7 @@ straightforward.  Older versions probably don't work.
 
 Visual Studio installed a batch file called vcvarsall.bat, which you must
 run to set up paths for nmake and MSVC.  We provide a batch file
-"msvc2015.bat" for this.  You may need to edit it if you didn't instal Visual
+"msvc2015.bat" for this.  You may need to edit it if you didn't install Visual
 Studio in the standard location.
 If you use VS2017 or later, you can use "msvc-latest.bat" (or "msvc2017.bat"
 and so on for the specific version).  You must specify the architecture (e.g.

src/auto/configure

@@ -13541,7 +13541,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <signal.h>
-test_sig()
+int test_sig()
 {
     struct sigcontext *scont;
     scont = (struct sigcontext *)0;

src/blob.c

@@ -716,7 +716,7 @@ blob_insert_func(typval_T *argvars, typval_T *rettv)
 }
 
 /*
- * Implementaion of reduce() for Blob "argvars[0]" using the function "expr"
+ * Implementation of reduce() for Blob "argvars[0]" using the function "expr"
  * starting with the optional initial value "argvars[2]" and return the result
  * in "rettv".
  */

src/bufwrite.c

@@ -1475,7 +1475,7 @@ buf_write(
 			{
 			    if (buf_write_bytes(&write_info) == FAIL)
 			    {
-				errmsg = (char_u *)_(e_canot_write_to_backup_file_add_bang_to_override);
+				errmsg = (char_u *)_(e_cant_write_to_backup_file_add_bang_to_override);
 				break;
 			    }
 			    ui_breakcheck();

src/change.c

@@ -1378,7 +1378,7 @@ del_bytes(
  * "second_line_indent": indent for after ^^D in Insert mode or if flag
  *			  OPENLINE_COM_LIST
  * "did_do_comment" is set to TRUE when intentionally putting the comment
- * leader in fromt of the new line.
+ * leader in front of the new line.
  *
  * Return OK for success, FAIL for failure
  */

src/charset.c

@@ -2291,7 +2291,7 @@ vim_str2nr(
 	}
 	else
 	{
-	    // prevent a larg unsigned number to become negative
+	    // prevent a large unsigned number to become negative
 	    if (un > VARNUM_MAX)
 		un = VARNUM_MAX;
 	    *nptr = (varnumber_T)un;

src/config.h.in

@@ -135,7 +135,7 @@
 /* Define if struct sigcontext is present */
 #undef HAVE_SIGCONTEXT
 
-/* Define if touuper/tolower only work on lower/upercase characters */
+/* Define if toupper/tolower only work on lower/uppercase characters */
 #undef BROKEN_TOUPPER
 
 /* Define if stat() ignores a trailing slash */

src/configure.ac

@@ -3853,7 +3853,7 @@ dnl check if struct sigcontext is defined (used for SGI only)
 AC_MSG_CHECKING(for struct sigcontext)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 #include <signal.h>
-test_sig()
+int test_sig()
 {
     struct sigcontext *scont;
     scont = (struct sigcontext *)0;

src/dict.c

@@ -1016,7 +1016,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
 	    item = dict_find(d, key, -1);
 	    if (item != NULL)
 	    {
-		semsg(_(e_duplicate_key_in_dicitonary), key);
+		semsg(_(e_duplicate_key_in_dictionary), key);
 		clear_tv(&tvkey);
 		clear_tv(&tv);
 		goto failret;