patch 8.2.0464: typos and other small problems

Problem:    Typos and other small problems.
Solution:   Fix the typos.  Add missing files to the distribution.

diff --git a/Filelist b/Filelist
index 2ea9a6ffabaf8230daa69ef1f3a757b1e8a4dd3b..25bfb4c014cd786958614b40c8eb27938eb05268 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -12,6 +12,7 @@ SRC_ALL =     \
                appveyor.yml \
                ci/appveyor.bat \
                ci/if_ver*.vim \
+               ci/load-snd-dummy.sh \
                src/Make_all.mak \
                src/README.md \
                src/alloc.h \
@@ -151,17 +152,18 @@ SRC_ALL = \
                src/testdir/*.py \
                src/testdir/lsan-suppress.txt \
                src/testdir/sautest/autoload/*.vim \
-               src/testdir/runtest.vim \
-               src/testdir/summarize.vim \
                src/testdir/check.vim \
-               src/testdir/shared.vim \
+               src/testdir/gui_init.vim \
+               src/testdir/gui_preinit.vim \
+               src/testdir/mouse.vim \
+               src/testdir/runtest.vim \
                src/testdir/screendump.vim \
-               src/testdir/view_util.vim \
-               src/testdir/term_util.vim \
                src/testdir/setup.vim \
-               src/testdir/gui_init.vim \
                src/testdir/setup_gui.vim \
-               src/testdir/gui_preinit.vim \
+               src/testdir/shared.vim \
+               src/testdir/summarize.vim \
+               src/testdir/term_util.vim \
+               src/testdir/view_util.vim \
                src/testdir/test[0-9]*.ok \
                src/testdir/test[0-9]*a.ok \
                src/testdir/test_[a-z]*.ok \

diff --git a/src/buffer.c b/src/buffer.c
index 2dcbae2aea02542eea3730b39390b0d920174f6b..cec33b0a45029840701fcdf21c71329ddf385956 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2014,7 +2014,10 @@ buflist_new(
            apply_autocmds(EVENT_BUFWIPEOUT, NULL, NULL, FALSE, curbuf);
 #ifdef FEAT_EVAL
        if (aborting())         // autocmds may abort script processing
+       {
+           vim_free(ffname);
            return NULL;
+       }
 #endif
        if (buf == curbuf)
        {

diff --git a/src/drawline.c b/src/drawline.c
index 9f943e03aa97126e73710cf52112231756e7b135..1544dae2840402fea14197e3118120d90c947408 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -270,7 +270,6 @@ win_line(
     int                tocol = MAXCOL;         // end of inverting
     int                fromcol_prev = -2;      // start of inverting after cursor
     int                noinvcur = FALSE;       // don't invert the cursor
-    pos_T      *top, *bot;
     int                lnum_in_visual_area = FALSE;
     pos_T      pos;
     long       v;
@@ -535,6 +534,8 @@ win_line(
        // handle Visual active in this window
        if (VIsual_active && wp->w_buffer == curwin->w_buffer)
        {
+           pos_T       *top, *bot;
+
            if (LTOREQ_POS(curwin->w_cursor, VIsual))
            {
                // Visual is after curwin->w_cursor

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index ef930a5664580f8de9ab4fc4a850691a3051a4fd..ea43c93850dd391298e4254a58e783cce5705764 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4743,6 +4743,8 @@ is_cjk_font(PangoFontDescription *font_desc)
        PangoCoverage   *coverage;
        gunichar        uc;
 
+       // Valgrind reports a leak for pango_language_from_string(), but the
+       // documentation says "This is owned by Pango and should not be freed".
        coverage = pango_font_get_coverage(
                font, pango_language_from_string(cjk_langs[i]));
 

diff --git a/src/os_unixx.h b/src/os_unixx.h
index 8a456c2e230fe3047fc9399558e57afcc4452ee4..3d1927bed61f8a03da09371b5cfe0f5cd47a5634 100644 (file)
--- a/src/os_unixx.h
+++ b/src/os_unixx.h
@@ -47,13 +47,13 @@
 #endif // !USE_SYSTEM
 
 #ifdef HAVE_STROPTS_H
-#ifdef sinix
-#define buf_T __system_buf_t__
-#endif
+# ifdef sinix
+#  define buf_T __system_buf_t__
+# endif
 # include <stropts.h>
-#ifdef sinix
-#undef buf_T
-#endif
+# ifdef sinix
+#  undef buf_T
+# endif
 #endif
 
 #ifdef HAVE_STRING_H

diff --git a/src/proto/popupwin.pro b/src/proto/popupwin.pro
index 7608f32a2623db3d92af4ea3b4896caf060731f8..96b21b643e4f1c685a67a85e3f87d059ec92de74 100644 (file)
--- a/src/proto/popupwin.pro
+++ b/src/proto/popupwin.pro
@@ -33,6 +33,7 @@ void f_popup_hide(typval_T *argvars, typval_T *rettv);
 void popup_show(win_T *wp);
 void f_popup_show(typval_T *argvars, typval_T *rettv);
 void f_popup_settext(typval_T *argvars, typval_T *rettv);
+int error_if_popup_window(int also_with_term);
 void popup_close(int id);
 void popup_close_tabpage(tabpage_T *tp, int id);
 void close_all_popups(void);
@@ -41,7 +42,6 @@ void f_popup_setoptions(typval_T *argvars, typval_T *rettv);
 void f_popup_getpos(typval_T *argvars, typval_T *rettv);
 void f_popup_locate(typval_T *argvars, typval_T *rettv);
 void f_popup_getoptions(typval_T *argvars, typval_T *rettv);
-int error_if_popup_window(int also_with_term);
 int error_if_term_popup_window(void);
 void popup_reset_handled(int handled_flag);
 win_T *find_next_popup(int lowest, int handled_flag);

diff --git a/src/version.c b/src/version.c
index 752044cfda3d0c6415044b9771e4983f09074d2a..468443abb7315bd3fbd596e9d6d8a6c45e067bd6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    464,
 /**/
     463,
 /**/