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 2ea9a6f..25bfb4c 100644
--- a/Filelist
+++ b/Filelist
@@ -12,6 +12,7 @@
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/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/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/mouse.vim \
+ src/testdir/runtest.vim \
+ src/testdir/screendump.vim \
+ src/testdir/setup.vim \
+ src/testdir/setup_gui.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 2dcbae2..cec33b0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2014,7 +2014,10 @@
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 9f943e0..1544dae 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -270,7 +270,6 @@
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 @@
// 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 ef930a5..ea43c93 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4743,6 +4743,8 @@
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 8a456c2..3d1927b 100644
--- 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 7608f32..96b21b6 100644
--- a/src/proto/popupwin.pro
+++ b/src/proto/popupwin.pro
@@ -33,6 +33,7 @@
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_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 752044c..468443a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 464,
+/**/
463,
/**/
462,