updated for version 7.4.295

Problem:    Various typos, bad white space and unclear comments.
Solution:   Fix typos.  Improve white space. Update comments.

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 3e1616c853b9437e287f042247c362a79bb72f13..0be60ad014b0422823b58642ec204793a5676af9 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2054,6 +2054,7 @@ write_session_file(char_u *filename)
 
     ssop_flags = save_ssop_flags;
     g_free(mksession_cmdline);
+
     /*
      * Reopen the file and append a command to restore v:this_session,
      * as if this save never happened. This is to avoid conflicts with

diff --git a/src/macros.h b/src/macros.h
index f4a068cfb9698f44a7226cbbb1a716c7a13ca5a9..2706a02524e49dfe008613c5cd982296e7138384 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -264,7 +264,7 @@
 # define mb_ptr_adv(p)     p += has_mbyte ? (*mb_ptr2len)(p) : 1
 /* Advance multi-byte pointer, do not skip over composing chars. */
 # define mb_cptr_adv(p)            p += enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1
-/* Backup multi-byte pointer. */
+/* Backup multi-byte pointer. Only use with "p" > "s" ! */
 # define mb_ptr_back(s, p)  p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1
 /* get length of multi-byte char, not including composing chars */
 # define mb_cptr2len(p)            (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))

diff --git a/src/os_unix.c b/src/os_unix.c
index b735a13bb0f4adc3fe4db4c19f69ed8c0eaeed97..65ce685605bef47130d466cd18edd05527e31b53 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3783,7 +3783,7 @@ check_mouse_termcode()
        del_mouse_termcode(KS_URXVT_MOUSE);
 # endif
 # ifdef FEAT_MOUSE_SGR
-    /* same as the dec mouse */
+    /* There is no conflict with xterm mouse */
     if (use_xterm_mouse() == 4
 #  ifdef FEAT_GUI
            && !gui.in_use

diff --git a/src/screen.c b/src/screen.c
index f8021372006c455e6d769897f9f21373fcfc3dae..cdb416d03d8dadad74313fb821e07741c070119a 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -2456,8 +2456,8 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
        if (len > 0)
        {
            int     w = number_width(wp);
-           long num;
-           char *fmt = "%*ld ";
+           long    num;
+           char    *fmt = "%*ld ";
 
            if (len > w + 1)
                len = w + 1;

diff --git a/src/structs.h b/src/structs.h
index 9bb35ceec1e40ea424cf290cbcbffd1837468b35..16a20716a4c1afedcef13be8e64cfb1d23f49a29 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -572,7 +572,7 @@ struct memfile
     unsigned   mf_page_size;           /* number of bytes in a page */
     int                mf_dirty;               /* TRUE if there are dirty blocks */
 #ifdef FEAT_CRYPT
-    buf_T      *mf_buffer;             /* bufer this memfile is for */
+    buf_T      *mf_buffer;             /* buffer this memfile is for */
     char_u     mf_seed[MF_SEED_LEN];   /* seed for encryption */
 
     /* Values for key, method and seed used for reading data blocks when

diff --git a/src/testdir/test49.in b/src/testdir/test49.in
index bd6cb4cad751af5c62c814d60709385cfa6f935c..5e1d6b461eeb0c39a2871882b33464e6b8b5eb79 100644 (file)
--- a/src/testdir/test49.in
+++ b/src/testdir/test49.in
@@ -1,7 +1,7 @@
 This is a test of the script language.
 
 If after adding a new test, the test output doesn't appear properly in
-test49.failed, try to add one ore more "G"s at the line ending in "test.out"
+test49.failed, try to add one or more "G"s at the line ending in "test.out"
 
 STARTTEST
 :so small.vim

diff --git a/src/version.c b/src/version.c
index 94e4e2d467b94e2d9d47ca9da9d0fc1f3837d897..3ea187df271fb588432c779b65e2e97d15e370de 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    295,
 /**/
     294,
 /**/