updated for version 7.2-289

diff --git a/src/getchar.c b/src/getchar.c
index b39ff74a36839d0527b94ef03b3b26b11241e8ca..f4ad8d2a05b8bfaeb91ceb7fc8ceb723084a8de0 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -22,7 +22,7 @@
  * These buffers are used for storing:
  * - stuffed characters: A command that is translated into another command.
  * - redo characters: will redo the last change.
- * - recorded chracters: for the "q" command.
+ * - recorded characters: for the "q" command.
  *
  * The bytes are stored like in the typeahead buffer:
  * - K_SPECIAL introduces a special key (two more bytes follow).  A literal
@@ -1283,7 +1283,7 @@ free_typebuf()
        EMSG2(_(e_intern2), "Free typebuf 1");
     else
        vim_free(typebuf.tb_buf);
-    if (typebuf.tb_buf == noremapbuf_init)
+    if (typebuf.tb_noremap == noremapbuf_init)
        EMSG2(_(e_intern2), "Free typebuf 2");
     else
        vim_free(typebuf.tb_noremap);
@@ -1516,7 +1516,7 @@ updatescript(c)
  * wanted.
  * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte.
  * Collects the bytes of a multibyte character into the whole character.
- * Returns the modifers in the global "mod_mask".
+ * Returns the modifiers in the global "mod_mask".
  */
     int
 vgetc()
@@ -3320,7 +3320,7 @@ do_map(maptype, arg, mode, abbrev)
                            retval = 1;
                            goto theend;
                        }
-           /* An abbrevation cannot contain white space. */
+           /* An abbreviation cannot contain white space. */
            for (n = 0; n < len; ++n)
                if (vim_iswhite(keys[n]))
                {
@@ -4272,7 +4272,7 @@ check_abbr(c, ptr, col, mincol)
 
     /*
      * Check for word before the cursor: If it ends in a keyword char all
-     * chars before it must be al keyword chars or non-keyword chars, but not
+     * chars before it must be keyword chars or non-keyword chars, but not
      * white space. If it ends in a non-keyword char we accept any characters
      * before it except white space.
      */

diff --git a/src/version.c b/src/version.c
index 8dae6f7f58cb15b6e9f91e64831ecbbdfeb57501..cbd34ff07859554ed6d7b0574c5f64469667eedc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    289,
 /**/
     288,
 /**/