Skip to content

Commit e910841

Browse files
ychinychin
committed
Merge remote-tracking branch 'vim/master'
2 parents c368ebb + 96952b2 commit e910841

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+778
-157
lines changed

‎runtime/autoload/netrw.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@ endfun
19611961
" Doing this means that netrw will not come up as having changed a
19621962
" setting last when it really didn't actually change it.
19631963
"
1964-
" Used by s:NetrwOptionsRestore() to restore each netrw-senstive setting
1964+
" Used by s:NetrwOptionsRestore() to restore each netrw-sensitive setting
19651965
" keepvars are set up by s:NetrwOptionsSave
19661966
fun! s:NetrwRestoreSetting(keepvar,setting)
19671967
""" call Dfunc("s:NetrwRestoreSetting(a:keepvar<".a:keepvar."> a:setting<".a:setting.">)")
@@ -5562,7 +5562,7 @@ fun! netrw#BrowseX(fname,remote)
55625562
" cleanup: remove temporary file,
55635563
" delete current buffer if success with handler,
55645564
" return to prior buffer (directory listing)
5565-
" Feb 12, 2008: had to de-activiate removal of
5565+
" Feb 12, 2008: had to de-activate removal of
55665566
" temporary file because it wasn't getting seen.
55675567
" if remote == 1 && fname != a:fname
55685568
"" call Decho("deleting temporary file<".fname.">",'~'.expand("<slnum>"))

‎runtime/autoload/phpcomplete.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -2907,7 +2907,7 @@ endfor
29072907
" builtin class information
29082908
let g:php_builtin_object_functions = {}
29092909

2910-
" When completing for 'everyting imaginable' (no class context, not a
2910+
" When completing for 'everything imaginable' (no class context, not a
29112911
" variable) we need a list of built-in classes in a format of {'classname':''}
29122912
" for performance reasons we precompile this too
29132913
let g:php_builtin_classnames = {}

‎runtime/autoload/rustfmt.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function! rustfmt#DetectVersion()
2525
silent let s:rustfmt_help = system(g:rustfmt_command . " --help")
2626
let s:rustfmt_unstable_features = s:rustfmt_help =~# "--unstable-features"
2727

28-
" Build a comparable rustfmt version varible out of its `--version` output:
28+
" Build a comparable rustfmt version variable out of its `--version` output:
2929
silent let l:rustfmt_version_full = system(g:rustfmt_command . " --version")
3030
let l:rustfmt_version_list = matchlist(l:rustfmt_version_full,
3131
\ '\vrustfmt ([0-9]+[.][0-9]+[.][0-9]+)')

‎runtime/autoload/typeset.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ enddef
9797

9898
# Public interface {{{
9999
# When a TeX document is split into several source files, each source file
100-
# may contain a "magic line" specifiying the "root" file, e.g.:
100+
# may contain a "magic line" specifying the "root" file, e.g.:
101101
#
102102
# % !TEX root = main.tex
103103
#

‎runtime/colors/README.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ please check the following items:
111111
- Do not use hard coded escape sequences, these will not work in other
112112
terminals. Always use #RRGGBB for the GUI.
113113

114-
- When targetting 8-16 colors terminals, don't count on "darkblue" to be blue
114+
- When targeting 8-16 colors terminals, don't count on "darkblue" to be blue
115115
and dark, or on "2" to be even vaguely reddish. Names are more portable
116116
than numbers, though.
117117

118-
- When targetting 256 colors terminals, prefer colors 16-255 to colors 0-15
118+
- When targeting 256 colors terminals, prefer colors 16-255 to colors 0-15
119119
for the same reason.
120120

121121
- Typographic attributes (bold, italic, underline, reverse, etc.) are not

‎runtime/doc/builtin.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10143,9 +10143,9 @@ trim({text} [, {mask} [, {dir}]]) *trim()*
1014310143
Return {text} as a String where any character in {mask} is
1014410144
removed from the beginning and/or end of {text}.
1014510145

10146-
If {mask} is not given, {mask} is all characters up to 0x20,
10147-
which includes Tab, space, NL and CR, plus the non-breaking
10148-
space character 0xa0.
10146+
If {mask} is not given, or is an empty string, {mask} is all
10147+
characters up to 0x20, which includes Tab, space, NL and CR,
10148+
plus the non-breaking space character 0xa0.
1014910149

1015010150
The optional {dir} argument specifies where to remove the
1015110151
characters:

‎runtime/doc/index.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1119,12 +1119,12 @@ commands in wildmenu mode (see 'wildmenu')
11191119
<Left> select the previous match / move up to parent
11201120
<Right> select the next match / move down to submenu
11211121
<CR> move into submenu when doing menu completion
1122+
CTRL-E stop completion and go back to original text
1123+
CTRL-Y accept selected match and stop completion
11221124
other stop completion and insert the typed character
11231125

11241126
commands in wildmenu mode with 'wildoptions' set to "pum"
11251127

1126-
CTRL-E stop completion and go back to original text
1127-
CTRL-Y accept selected match and stop completion
11281128
<PageUp> select a match several entries back
11291129
<PageDown> select a match several entries forward
11301130

‎runtime/doc/options.txt

+6-4
Original file line numberDiff line numberDiff line change
@@ -9397,6 +9397,8 @@ A jump table for the options with a short description can be found at |Q_op|.
93979397
The character is not recognized when used inside a macro. See
93989398
'wildcharm' for that.
93999399
Some keys will not work, such as CTRL-C, <CR> and Enter.
9400+
<Esc> can be used, but hitting it twice in a row will still exit
9401+
command-line as a failsafe measure.
94009402
Although 'wc' is a number option, you can set it to a special key: >
94019403
:set wc=<Tab>
94029404
< NOTE: This option is set to the Vi default value when 'compatible' is
@@ -9465,6 +9467,10 @@ A jump table for the options with a short description can be found at |Q_op|.
94659467
CTRL-N - go to the next entry
94669468
<CR> - in menu completion, when the cursor is just after a
94679469
dot: move into a submenu.
9470+
CTRL-E - end completion, go back to what was there before
9471+
selecting a match.
9472+
CTRL-Y - accept the currently selected match and stop
9473+
completion.
94689474

94699475
When not using the popup menu for command line completion, the
94709476
following keys have special meanings:
@@ -9483,10 +9489,6 @@ A jump table for the options with a short description can be found at |Q_op|.
94839489
parent directory or parent menu.
94849490
<Right> - in filename/menu name completion: move into a
94859491
subdirectory or submenu.
9486-
CTRL-E - end completion, go back to what was there before
9487-
selecting a match.
9488-
CTRL-Y - accept the currently selected match and stop
9489-
completion.
94909492

94919493
This makes the menus accessible from the console |console-menus|.
94929494

‎runtime/doc/starting.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*starting.txt* For Vim version 9.0. Last change: 2023 May 30
1+
*starting.txt* For Vim version 9.0. Last change: 2023 Oct 17
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -348,7 +348,7 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
348348
Start logging and write entries to {filename}.
349349
This works like calling `ch_logfile({filename}, 'ao')` very
350350
early during startup.
351-
{only available with the |+eval| feature}
351+
{only available with the |+eval| and |+channel| feature}
352352

353353
*-D*
354354
-D Debugging. Go to debugging mode when executing the first

‎runtime/indent/cdl.vim

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ endif
2121

2222
" find out if an "...=..." expression is an assignment (or a conditional)
2323
" it scans 'line' first, and then the previous lines
24-
fun! CdlAsignment(lnum, line)
24+
fun! CdlAssignment(lnum, line)
2525
let f = -1
2626
let lnum = a:lnum
2727
let line = a:line
@@ -90,7 +90,7 @@ fun! CdlGetIndent(lnum)
9090
end
9191
end
9292

93-
" remove members [a] of [b]:[c]... (inicio remainds valid)
93+
" remove members [a] of [b]:[c]... (inicio remains valid)
9494
let line = substitute(line, '\c\(\[[^]]*]\(\s*of\s*\|:\)*\)\+', ' ', 'g')
9595
while 1
9696
" search for the next interesting element
@@ -111,7 +111,7 @@ fun! CdlGetIndent(lnum)
111111
else " c == '='
112112
" if it is an assignment increase indent
113113
if f == -1 " we don't know yet, find out
114-
let f = CdlAsignment(lnum, strpart(line, 0, inicio))
114+
let f = CdlAssignment(lnum, strpart(line, 0, inicio))
115115
end
116116
if f == 1 " formula increase it
117117
let ind = ind + shiftwidth()
@@ -125,7 +125,7 @@ fun! CdlGetIndent(lnum)
125125
let ind = ind - shiftwidth()
126126
elseif match(thisline, '^\s*=') >= 0
127127
if f == -1 " we don't know yet if is an assignment, find out
128-
let f = CdlAsignment(lnum, "")
128+
let f = CdlAssignment(lnum, "")
129129
end
130130
if f == 1 " formula increase it
131131
let ind = ind + shiftwidth()

‎runtime/indent/erlang.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
13241324
" maybe A else
13251325
" LTI
13261326
"
1327-
" Note about Emacs compabitility {{{
1327+
" Note about Emacs compatibility {{{
13281328
"
13291329
" It would be fine to indent the examples above the following way:
13301330
"

‎runtime/indent/julia.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ function IsFunctionArgPar(lnum, c)
310310
endfunction
311311

312312
function JumpToMatch(lnum, last_closed_bracket)
313-
" we use the % command to skip back (tries to ues matchit if possible,
313+
" we use the % command to skip back (tries to use matchit if possible,
314314
" otherwise resorts to vim's default, which is buggy but better than
315315
" nothing)
316316
call cursor(a:lnum, a:last_closed_bracket)

‎runtime/indent/krl.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function GetKrlIndent() abort
4141
let currentLine = getline(v:lnum)
4242
if currentLine =~? '\v^;(\s*(end)?fold>)@!' && !get(g:, 'krlCommentIndent', 0)
4343
" If current line has a ; in column 1 and is no fold, keep zero indent.
44-
" This may be usefull if code is commented out at the first column.
44+
" This may be useful if code is commented out at the first column.
4545
return 0
4646
endif
4747

@@ -117,7 +117,7 @@ function s:KrlPreNoneBlank(lnum) abort
117117
let nPreNoneBlank = prevnonblank(a:lnum)
118118

119119
while nPreNoneBlank > 0 && getline(nPreNoneBlank) =~? '\v^\s*(\&\w\+|;|continue>)'
120-
" Previouse none blank line irrelevant. Look further aback.
120+
" Previous none blank line irrelevant. Look further aback.
121121
let nPreNoneBlank = prevnonblank(nPreNoneBlank - 1)
122122
endwhile
123123

‎runtime/indent/rapid.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function s:GetRapidIndentIntern() abort
7474

7575
if l:currentLine =~ '^!' && !get(g:,'rapidCommentIndent',0)
7676
" If current line is ! line comment, do not change indent
77-
" This may be usefull if code is commented out at the first column.
77+
" This may be useful if code is commented out at the first column.
7878
return 0
7979
endif
8080

‎runtime/indent/systemverilog.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ function SystemVerilogIndent()
7878
" Multiple-line comment count
7979
if curr_line =~ '^\s*/\*' && curr_line !~ '/\*.\{-}\*/'
8080
let s:multiple_comment += 1
81-
if vverb | echom vverb_str "Start of multiple-line commnt" | endif
81+
if vverb | echom vverb_str "Start of multiple-line comment" | endif
8282
elseif curr_line =~ '\*/\s*$' && curr_line !~ '/\*.\{-}\*/'
8383
let s:multiple_comment -= 1
84-
if vverb | echom vverb_str "End of multiple-line commnt" | endif
84+
if vverb | echom vverb_str "End of multiple-line comment" | endif
8585
return ind
8686
endif
8787
" Maintain indentation during commenting.

‎runtime/keymap/greek_utf-8.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
" without having to combine them with letters (usufull for grammarians
3535
" in particular) (especially for dasia and psiln we use ' for psili
3636
" (that is apostrophe) and ;' for dasia. This is done in order to
37-
" preserve the posibility to write a plain < or >.
37+
" preserve the possibility to write a plain < or >.
3838

3939
" Ypogegrammeni is | following the character (the originally proposed
4040
" i after the character is problematic: can't write easily ai or vi) :

‎runtime/macros/maze/maze_mac

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ map I G$?.^GYKeDP0S2Gl
190190
" into the Macro register
191191
" GVJ - on bottom line, create a command to restore the current character
192192
" 0H - and save the command into the second Macro register
193-
" `a@r - go back to the current position and exectute the macro to restore
193+
" `a@r - go back to the current position and execute the macro to restore
194194
" the current character
195195
" @m - execute the action associated with this state
196196
" U - and repeat

‎runtime/macros/urm/README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ in vim: :so urm.vim<RETURN>
1010
in vim: * (to load the registers and boot the URM-machine :-)
1111
in vim: g (for 'go') and watch the fun. Per default, 3 and 4
1212
are multiplied. Watch the Program counter, it is
13-
visible as a komma moving around.
13+
visible as a comma moving around.
1414

1515
This is a "standard URM" (Universal register machine) interpreter. The URM
1616
concept is used in theoretical computer science to aid in theorem proving.

‎runtime/makemenu.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ SynMenu AB.Assembly.PIC:pic
8989
SynMenu AB.Assembly.Turbo:tasm
9090
SynMenu AB.Assembly.VAX\ Macro\ Assembly:vmasm
9191
SynMenu AB.Assembly.Z-80:z8a
92-
SynMenu AB.Assembly.xa\ 6502\ cross\ assember:a65
92+
SynMenu AB.Assembly.xa\ 6502\ cross\ assembler:a65
9393
SynMenu AB.ASN\.1:asn
9494
SynMenu AB.Asterisk\ config:asterisk
9595
SynMenu AB.Asterisk\ voicemail\ config:asteriskvm
@@ -327,7 +327,7 @@ SynMenu HIJK.Kivy:kivy
327327
SynMenu HIJK.KixTart:kix
328328

329329
SynMenu L.Lace:lace
330-
SynMenu L.LamdaProlog:lprolog
330+
SynMenu L.LambdaProlog:lprolog
331331
SynMenu L.Latte:latte
332332
SynMenu L.Ld\ script:ld
333333
SynMenu L.LDAP.LDIF:ldif

‎runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" autoload/editorconfig_core/ini.vim: Config-file parser for
22
" editorconfig-core-vimscript and editorconfig-vim.
3-
" Modifed from the Python core's ini.py.
3+
" Modified from the Python core's ini.py.
44

55
" Copyright (c) 2012-2019 EditorConfig Team {{{2
66
" All rights reserved.

‎runtime/pack/dist/opt/termdebug/plugin/termdebug.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ func s:Run(args)
12191219
call s:SendResumingCommand('-exec-run')
12201220
endfunc
12211221

1222-
" :Frame - go to a specfic frame in the stack
1222+
" :Frame - go to a specific frame in the stack
12231223
func s:Frame(arg)
12241224
" Note: we explicit do not use mi's command
12251225
" call s:SendCommand('-stack-select-frame "' . a:arg .'"')

‎runtime/synmenu.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ an 50.10.440 &Syntax.AB.Assembly.PIC :cal SetSyn("pic")<CR>
7373
an 50.10.450 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm")<CR>
7474
an 50.10.460 &Syntax.AB.Assembly.VAX\ Macro\ Assembly :cal SetSyn("vmasm")<CR>
7575
an 50.10.470 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a")<CR>
76-
an 50.10.480 &Syntax.AB.Assembly.xa\ 6502\ cross\ assember :cal SetSyn("a65")<CR>
76+
an 50.10.480 &Syntax.AB.Assembly.xa\ 6502\ cross\ assembler :cal SetSyn("a65")<CR>
7777
an 50.10.490 &Syntax.AB.ASN\.1 :cal SetSyn("asn")<CR>
7878
an 50.10.500 &Syntax.AB.Asterisk\ config :cal SetSyn("asterisk")<CR>
7979
an 50.10.510 &Syntax.AB.Asterisk\ voicemail\ config :cal SetSyn("asteriskvm")<CR>
@@ -303,7 +303,7 @@ an 50.50.710 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR>
303303
an 50.50.720 &Syntax.HIJK.Kivy :cal SetSyn("kivy")<CR>
304304
an 50.50.730 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR>
305305
an 50.60.100 &Syntax.L.Lace :cal SetSyn("lace")<CR>
306-
an 50.60.110 &Syntax.L.LamdaProlog :cal SetSyn("lprolog")<CR>
306+
an 50.60.110 &Syntax.L.LambdaProlog :cal SetSyn("lprolog")<CR>
307307
an 50.60.120 &Syntax.L.Latte :cal SetSyn("latte")<CR>
308308
an 50.60.130 &Syntax.L.Ld\ script :cal SetSyn("ld")<CR>
309309
an 50.60.140 &Syntax.L.LDAP.LDIF :cal SetSyn("ldif")<CR>

‎runtime/syntax/abap.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ syn keyword abapStatement TABLES TIMES TRANSFER TRANSLATE TRY TYPE TYPES
122122
syn keyword abapStatement UNASSIGN ULINE UNPACK UPDATE
123123
syn keyword abapStatement WHEN WHILE WINDOW WRITE
124124

125-
" More statemets
125+
" More statements
126126
syn keyword abapStatement LINES
127127
syn keyword abapStatement INTO GROUP BY HAVING ORDER BY SINGLE
128128
syn keyword abapStatement APPENDING CORRESPONDING FIELDS OF TABLE

‎runtime/syntax/asm68k.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
" Last change: 2001 May 01
55
"
66
" This is incomplete. In particular, support for 68020 and
7-
" up and 68851/68881 co-processors is partial or non-existant.
7+
" up and 68851/68881 co-processors is partial or non-existent.
88
" Feel free to contribute...
99
"
1010

@@ -220,7 +220,7 @@ syn match asm68kOperator "<>" " inequality
220220
syn match asm68kOperator "=" " must be before other ops containing '='
221221
syn match asm68kOperator ">="
222222
syn match asm68kOperator "<="
223-
syn match asm68kOperator "==" " operand existance - used in macro definitions
223+
syn match asm68kOperator "==" " operand existence - used in macro definitions
224224

225225
" Condition code style operators
226226
syn match asm68kOperator "<[CV][CS]>"

‎runtime/syntax/chill.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ syn keyword chillLogical NOT not
2424
syn keyword chillRepeat while WHILE for FOR do DO od OD TO to
2525
syn keyword chillProcess START start STACKSIZE stacksize PRIORITY priority THIS this STOP stop
2626
syn keyword chillBlock PROC proc PROCESS process
27-
syn keyword chillSignal RECEIVE receive SEND send NONPERSISTENT nonpersistent PERSISTENT peristent SET set EVER ever
27+
syn keyword chillSignal RECEIVE receive SEND send NONPERSISTENT nonpersistent PERSISTENT persistent SET set EVER ever
2828

2929
syn keyword chillTodo contained TODO FIXME XXX
3030

‎runtime/syntax/debcontrol.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ syn iskeyword @,48-57,-
2222
" Everything that is not explicitly matched by the rules below
2323
syn match debcontrolElse "^.*$"
2424

25-
" Common seperators
25+
" Common separators
2626
syn match debControlComma ",[ \t]*"
2727
syn match debControlSpace "[ \t]"
2828

0 commit comments

Comments
 (0)