Skip to content

Commit 14285cb

Browse files
committed
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.
1 parent 2d9d409 commit 14285cb

7 files changed

Lines changed: 25 additions & 15 deletions

File tree

Filelist

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SRC_ALL = \
1212
appveyor.yml \
1313
ci/appveyor.bat \
1414
ci/if_ver*.vim \
15+
ci/load-snd-dummy.sh \
1516
src/Make_all.mak \
1617
src/README.md \
1718
src/alloc.h \
@@ -151,17 +152,18 @@ SRC_ALL = \
151152
src/testdir/*.py \
152153
src/testdir/lsan-suppress.txt \
153154
src/testdir/sautest/autoload/*.vim \
154-
src/testdir/runtest.vim \
155-
src/testdir/summarize.vim \
156155
src/testdir/check.vim \
157-
src/testdir/shared.vim \
156+
src/testdir/gui_init.vim \
157+
src/testdir/gui_preinit.vim \
158+
src/testdir/mouse.vim \
159+
src/testdir/runtest.vim \
158160
src/testdir/screendump.vim \
159-
src/testdir/view_util.vim \
160-
src/testdir/term_util.vim \
161161
src/testdir/setup.vim \
162-
src/testdir/gui_init.vim \
163162
src/testdir/setup_gui.vim \
164-
src/testdir/gui_preinit.vim \
163+
src/testdir/shared.vim \
164+
src/testdir/summarize.vim \
165+
src/testdir/term_util.vim \
166+
src/testdir/view_util.vim \
165167
src/testdir/test[0-9]*.ok \
166168
src/testdir/test[0-9]*a.ok \
167169
src/testdir/test_[a-z]*.ok \

src/buffer.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,7 +2014,10 @@ buflist_new(
20142014
apply_autocmds(EVENT_BUFWIPEOUT, NULL, NULL, FALSE, curbuf);
20152015
#ifdef FEAT_EVAL
20162016
if (aborting()) // autocmds may abort script processing
2017+
{
2018+
vim_free(ffname);
20172019
return NULL;
2020+
}
20182021
#endif
20192022
if (buf == curbuf)
20202023
{

src/drawline.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ win_line(
270270
int tocol = MAXCOL; // end of inverting
271271
int fromcol_prev = -2; // start of inverting after cursor
272272
int noinvcur = FALSE; // don't invert the cursor
273-
pos_T *top, *bot;
274273
int lnum_in_visual_area = FALSE;
275274
pos_T pos;
276275
long v;
@@ -535,6 +534,8 @@ win_line(
535534
// handle Visual active in this window
536535
if (VIsual_active && wp->w_buffer == curwin->w_buffer)
537536
{
537+
pos_T *top, *bot;
538+
538539
if (LTOREQ_POS(curwin->w_cursor, VIsual))
539540
{
540541
// Visual is after curwin->w_cursor

src/gui_gtk_x11.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4743,6 +4743,8 @@ is_cjk_font(PangoFontDescription *font_desc)
47434743
PangoCoverage *coverage;
47444744
gunichar uc;
47454745

4746+
// Valgrind reports a leak for pango_language_from_string(), but the
4747+
// documentation says "This is owned by Pango and should not be freed".
47464748
coverage = pango_font_get_coverage(
47474749
font, pango_language_from_string(cjk_langs[i]));
47484750

src/os_unixx.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747
#endif // !USE_SYSTEM
4848

4949
#ifdef HAVE_STROPTS_H
50-
#ifdef sinix
51-
#define buf_T __system_buf_t__
52-
#endif
50+
# ifdef sinix
51+
# define buf_T __system_buf_t__
52+
# endif
5353
# include <stropts.h>
54-
#ifdef sinix
55-
#undef buf_T
56-
#endif
54+
# ifdef sinix
55+
# undef buf_T
56+
# endif
5757
#endif
5858

5959
#ifdef HAVE_STRING_H

src/proto/popupwin.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ void f_popup_hide(typval_T *argvars, typval_T *rettv);
3333
void popup_show(win_T *wp);
3434
void f_popup_show(typval_T *argvars, typval_T *rettv);
3535
void f_popup_settext(typval_T *argvars, typval_T *rettv);
36+
int error_if_popup_window(int also_with_term);
3637
void popup_close(int id);
3738
void popup_close_tabpage(tabpage_T *tp, int id);
3839
void close_all_popups(void);
@@ -41,7 +42,6 @@ void f_popup_setoptions(typval_T *argvars, typval_T *rettv);
4142
void f_popup_getpos(typval_T *argvars, typval_T *rettv);
4243
void f_popup_locate(typval_T *argvars, typval_T *rettv);
4344
void f_popup_getoptions(typval_T *argvars, typval_T *rettv);
44-
int error_if_popup_window(int also_with_term);
4545
int error_if_term_popup_window(void);
4646
void popup_reset_handled(int handled_flag);
4747
win_T *find_next_popup(int lowest, int handled_flag);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
464,
741743
/**/
742744
463,
743745
/**/

0 commit comments

Comments
 (0)