1
0
forked from aniani/vim

patch 9.1.1319: Various typos in the code, issue with test_inst_complete.vim

Problem:  Various typos in the code, redundant and strange use of
          :execute in test_ins_complete.vim (after 9.1.1315).
Solution: Fix typos in the code and in the documentation, use the
          executed command directly (zeertzjq).

closes: #17143

Co-authored-by: Christ van Willegen <cvwillegen@gmail.com>
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2025-04-18 10:57:33 +02:00 committed by Christian Brabandt
parent e9a27ef373
commit 98800979dc
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
10 changed files with 16 additions and 14 deletions

View File

@ -1,4 +1,4 @@
*develop.txt* For Vim version 9.1. Last change: 2024 Dec 25 *develop.txt* For Vim version 9.1. Last change: 2025 Apr 18
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -192,7 +192,7 @@ For any non-trivial change, please always create a pull request on github,
since this triggers the test suite. since this triggers the test suite.
*style-clang-format* *style-clang-format*
sound.c and sign.c can be (semi-) automatically formated using the sound.c and sign.c can be (semi-) automatically formatted using the
`clang-format` formatter according to the distributed .clang-format file. `clang-format` formatter according to the distributed .clang-format file.
Other source files do not yet correspond to the .clang-format file. This may Other source files do not yet correspond to the .clang-format file. This may
change in the future and they may be reformatted as well. change in the future and they may be reformatted as well.

View File

@ -1,4 +1,4 @@
*version9.txt* For Vim version 9.1. Last change: 2025 Apr 16 *version9.txt* For Vim version 9.1. Last change: 2025 Apr 18
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -41594,7 +41594,7 @@ Default values: ~
- the default 'backspace' option for Vim has been set to "indent,eol,start" - the default 'backspace' option for Vim has been set to "indent,eol,start"
and removed from |defaults.vim| and removed from |defaults.vim|
- the default fontsize for the GTK builds of Vim (Windows and Unix) has been - the default fontsize for the GTK builds of Vim (Windows and Unix) has been
increased to 12pt to accomodate modern high-dpi monitors increased to 12pt to accommodate modern high-dpi monitors
- the default value of the 'keyprotocol' option has been updated and support - the default value of the 'keyprotocol' option has been updated and support
for the ghostty terminal emulator (using kitty protocol) has been added for the ghostty terminal emulator (using kitty protocol) has been added
@ -41739,7 +41739,7 @@ Ex-Commands: ~
Options: ~ Options: ~
'chistory' Size of the quickfix stack |quickfix-stack|. 'chistory' Size of the quickfix stack |quickfix-stack|.
'completefuzzycollect' Enable fuzzy collection of candiates for (some) 'completefuzzycollect' Enable fuzzy collection of candidates for (some)
|ins-completion| modes |ins-completion| modes
'completeitemalign' Order of |complete-items| in Insert mode completion 'completeitemalign' Order of |complete-items| in Insert mode completion
popup popup

View File

@ -3229,7 +3229,7 @@ diff_refine_inline_char_highlight(diff_T *dp_orig, garray_T *linemap, int idx1)
} }
/* /*
* Find the inline difference within a diff block among differnt buffers. Do * Find the inline difference within a diff block among different buffers. Do
* this by splitting each block's content into characters or words, and then * this by splitting each block's content into characters or words, and then
* use internal xdiff to calculate the per-character/word diff. The result is * use internal xdiff to calculate the per-character/word diff. The result is
* stored in dp instead of returned by the function. * stored in dp instead of returned by the function.
@ -4548,7 +4548,7 @@ f_diff_hlID(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{ {
// Remember the results if using simple since it's recalculated per // Remember the results if using simple since it's recalculated per
// call. Otherwise just call diff_find_change() every time since // call. Otherwise just call diff_find_change() every time since
// internally the result is cached interally. // internally the result is cached internally.
cache_results = FALSE; cache_results = FALSE;
} }

View File

@ -2786,7 +2786,7 @@ nv_zet(cmdarg_T *cap)
} }
break; break;
// "zp", "zP" in block mode put without addind trailing spaces // "zp", "zP" in block mode put without adding trailing spaces
case 'P': case 'P':
case 'p': nv_put(cap); case 'p': nv_put(cap);
break; break;

View File

@ -248,11 +248,11 @@ get_vts_sum(int *vts_array, int index)
int sum = 0; int sum = 0;
int i; int i;
// Perform the summation for indeces within the actual array. // Perform the summation for indices within the actual array.
for (i = 1; i <= index && i <= vts_array[0]; i++) for (i = 1; i <= index && i <= vts_array[0]; i++)
sum += vts_array[i]; sum += vts_array[i];
// Add topstops whose indeces exceed the actual array. // Add tabstops whose indices exceed the actual array.
if (i <= index) if (i <= index)
sum += vts_array[vts_array[0]] * (index - vts_array[0]); sum += vts_array[vts_array[0]] * (index - vts_array[0]);

View File

@ -4434,7 +4434,7 @@ mch_report_winsize(int fd, int rows, int cols)
ws.ws_col = cols; ws.ws_col = cols;
ws.ws_row = rows; ws.ws_row = rows;
// calcurate and set tty pixel size // calculate and set tty pixel size
struct cellsize cs; struct cellsize cs;
mch_calc_cell_size(&cs); mch_calc_cell_size(&cs);

View File

@ -119,7 +119,7 @@ struct qf_info_S
}; };
static qf_info_T ql_info_actual; // global quickfix list static qf_info_T ql_info_actual; // global quickfix list
static qf_info_T *ql_info; // points to ql_info_actual if memory allocation is sucessful. static qf_info_T *ql_info; // points to ql_info_actual if memory allocation is successful.
static int_u last_qf_id = 0; // Last used quickfix list id static int_u last_qf_id = 0; // Last used quickfix list id
#define FMT_PATTERNS 14 // maximum number of % recognized #define FMT_PATTERNS 14 // maximum number of % recognized

View File

@ -1710,7 +1710,7 @@ static char *(key_names[]) =
// Do those ones first, both may cause a screen redraw. // Do those ones first, both may cause a screen redraw.
"Co", "Co",
// disabled, because it switches termguicolors, but that // disabled, because it switches termguicolors, but that
// is noticable and confuses users // is noticeable and confuses users
// "RGB", // "RGB",
# endif # endif
"ku", "kd", "kr", "kl", "ku", "kd", "kr", "kl",

View File

@ -3598,7 +3598,7 @@ func Test_complete_fuzzy_collect()
call feedkeys("Gofuzzy\<C-X>\<C-N>\<C-N>\<C-N>\<C-Y>\<Esc>0", 'tx!') call feedkeys("Gofuzzy\<C-X>\<C-N>\<C-N>\<C-N>\<C-Y>\<Esc>0", 'tx!')
call assert_equal('completefuzzycollect', getline('.')) call assert_equal('completefuzzycollect', getline('.'))
execute('%d _') %d _
call setline(1, ['fuzzy', 'fuzzy foo', "fuzzy bar", 'fuzzycollect']) call setline(1, ['fuzzy', 'fuzzy foo', "fuzzy bar", 'fuzzycollect'])
call feedkeys("Gofuzzy\<C-X>\<C-N>\<C-N>\<C-N>\<C-Y>\<Esc>0", 'tx!') call feedkeys("Gofuzzy\<C-X>\<C-N>\<C-N>\<C-N>\<C-Y>\<Esc>0", 'tx!')
call assert_equal('fuzzycollect', getline('.')) call assert_equal('fuzzycollect', getline('.'))

View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1319,
/**/ /**/
1318, 1318,
/**/ /**/