Skip to content

Commit a9604e6

Browse files
committed
Update runtime files.
1 parent 872e451 commit a9604e6

30 files changed

Lines changed: 724 additions & 433 deletions

CONTRIBUTING.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,18 @@ If the maintainer does not respond, contact the vim-dev maillist.
5757
# Translations
5858

5959
Translating messages and runtime files is very much appreciated! These things can be translated:
60-
* Messages in Vim, see src/po/README.txt
61-
* Menus, see runtime/lang/README.txt
62-
* Vim tutor, see runtime/tutor/README.txt
63-
* Manual pages, see runtime/doc/*.1 for examples
64-
* Desktop icon, see runtime/vim.desktop and runtime/gvim.desktop
60+
* Messages in Vim, see [src/po/README.txt][1]
61+
* Menus, see [runtime/lang/README.txt][2]
62+
* Vim tutor, see [runtime/tutor/README.txt][3]
63+
* Manual pages, see [runtime/doc/\*.1][4] for examples
64+
* Desktop icon, see [runtime/vim.desktop][5] and [runtime/gvim.desktop][6]
6565

6666
The help files can be translated and made available separately.
6767
See https://www.vim.org/translations.php for examples.
68+
69+
[1]: https://github.com/vim/vim/blob/master/src/po/README.txt
70+
[2]: https://github.com/vim/vim/blob/master/runtime/lang/README.txt
71+
[3]: https://github.com/vim/vim/blob/master/runtime/tutor/README.txt
72+
[4]: https://github.com/vim/vim/blob/master/runtime/doc/vim.1
73+
[5]: https://github.com/vim/vim/blob/master/runtime/vim.desktop
74+
[6]: https://github.com/vim/vim/blob/master/runtime/gvim.desktop

runtime/autoload/spellfile.vim

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function! spellfile#LoadFile(lang)
2222
endif
2323
return
2424
endif
25+
let lang = tolower(a:lang)
2526

2627
" If the URL changes we try all files again.
2728
if s:spellfile_URL != g:spellfile_URL
@@ -30,13 +31,13 @@ function! spellfile#LoadFile(lang)
3031
endif
3132

3233
" I will say this only once!
33-
if has_key(s:donedict, a:lang . &enc)
34+
if has_key(s:donedict, lang . &enc)
3435
if &verbose
3536
echomsg 'spellfile#LoadFile(): Tried this language/encoding before.'
3637
endif
3738
return
3839
endif
39-
let s:donedict[a:lang . &enc] = 1
40+
let s:donedict[lang . &enc] = 1
4041

4142
" Find spell directories we can write in.
4243
let [dirlist, dirchoices] = spellfile#GetDirChoices()
@@ -57,14 +58,14 @@ function! spellfile#LoadFile(lang)
5758
endif
5859
endif
5960

60-
let msg = 'Cannot find spell file for "' . a:lang . '" in ' . &enc
61+
let msg = 'Cannot find spell file for "' . lang . '" in ' . &enc
6162
let msg .= "\nDo you want me to try downloading it?"
6263
if confirm(msg, "&Yes\n&No", 2) == 1
6364
let enc = &encoding
6465
if enc == 'iso-8859-15'
6566
let enc = 'latin1'
6667
endif
67-
let fname = a:lang . '.' . enc . '.spl'
68+
let fname = lang . '.' . enc . '.spl'
6869

6970
" Split the window, read the file into a new buffer.
7071
" Remember the buffer number, we check it below.
@@ -95,7 +96,7 @@ function! spellfile#LoadFile(lang)
9596
let newbufnr = winbufnr(0)
9697
endif
9798

98-
let fname = a:lang . '.ascii.spl'
99+
let fname = lang . '.ascii.spl'
99100
echo 'Could not find it, trying ' . fname . '...'
100101
call spellfile#Nread(fname)
101102
if getline(2) !~ 'VIMspell'

runtime/doc/evim-ja.UTF-8.1

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ MS-Windows のメモ帳のような動作です。
2525
.PP
2626
引数や Vim についての詳細は vim(1) を参照してください。
2727
.PP
28-
オプション 'insertmode' が設定され、テキストを直接、入力できるようになりま
29-
す。
28+
オプション 'insertmode' が設定され、テキストを直接、入力できるようになります。
3029
.br
31-
コピーとペーストのキー操作が MS-Windows と同じになるように、マップが設定され
32-
ます。
30+
コピーとペーストのキー操作が MS-Windows と同じになるように、マップが設定されます。
3331
CTRL-X が切り取り、CTRL-C がコピー、CTRL-V がペーストです。
3432
標準の CTRL-V の操作は CTRL-Q に割り当てられます。
3533
.SH オプション
@@ -41,8 +39,7 @@ eVim の初期化スクリプト。
4139
.SH 別名
4240
evim は "gumbies のための Vim" とも呼ばれています。
4341
evim を使っているあなたはきっと、頭にハンカチをかぶっているのです。
44-
(訳注: gumbies は Monty Python に登場するおもしろ集団。ハンカチをかぶっ
45-
ている。)
42+
(訳注: gumbies は Monty Python に登場するおもしろ集団。ハンカチをかぶっている。)
4643
.SH 関連項目
4744
vim(1)
4845
.SH 著者

runtime/doc/motion.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ remembered.
11641164
*:changes*
11651165
:changes Print the change list. A ">" character indicates the
11661166
current position. Just after a change it is below the
1167-
newest entry, indicating that "g;" takes you to the
1167+
newest entry, indicating that `g;` takes you to the
11681168
newest entry position. The first column indicates the
11691169
count needed to take you to this position. Example:
11701170

@@ -1174,8 +1174,8 @@ remembered.
11741174
1 14 54 the latest changed line
11751175
>
11761176
1177-
The "3g;" command takes you to line 9. Then the
1178-
output of ":changes is:
1177+
The `3g;` command takes you to line 9. Then the
1178+
output of `:changes` is:
11791179
11801180
change line col text ~
11811181
> 0 9 8 bla bla bla

runtime/doc/options.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,10 +2087,10 @@ A jump table for the options with a short description can be found at |Q_op|.
20872087
See also |map_bar|.
20882088
*cpo-B*
20892089
B A backslash has no special meaning in mappings,
2090-
abbreviations and the "to" part of the menu commands.
2091-
Remove this flag to be able to use a backslash like a
2092-
CTRL-V. For example, the command ":map X \<Esc>"
2093-
results in X being mapped to:
2090+
abbreviations, user commands and the "to" part of the
2091+
menu commands. Remove this flag to be able to use a
2092+
backslash like a CTRL-V. For example, the command
2093+
":map X \<Esc>" results in X being mapped to:
20942094
'B' included: "\^[" (^[ is a real <Esc>)
20952095
'B' excluded: "<Esc>" (5 characters)
20962096
('<' excluded in both cases)

runtime/doc/pattern.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,14 @@ the "#" is under your left hand middle finger (search to the left and up) and
293293
the "*" is under your right hand middle finger (search to the right and down).
294294
(this depends on your keyboard layout though).
295295

296+
*E956*
297+
In very rare cases a regular expression is used recursively. This can happen
298+
when executing a pattern takes a long time and when checkig for messages on
299+
channels a callback is invoked that also uses a pattern or an autocommand is
300+
triggered. In most cases this should be fine, but if a pattern is in use when
301+
it's used again it fails. Usually this means there is something wrong with
302+
the pattern.
303+
296304
==============================================================================
297305
2. The definition of a pattern *search-pattern* *pattern* *[pattern]*
298306
*regular-expression* *regexp* *Pattern*

runtime/doc/starting.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,11 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
511511
{not in Vi}
512512

513513
*--clean*
514-
--clean Equal to "-u DEFAULTS -U NONE -i NONE":
514+
--clean Similar to "-u DEFAULTS -U NONE -i NONE":
515515
- initializations from files and environment variables is
516516
skipped
517+
-'runtimepath'and 'packpath' are set to exclude home
518+
directory entries (does not happen with -u DEFAULTS).
517519
- the |defaults.vim| script is loaded, which implies
518520
'nocompatible': use Vim defaults
519521
- no |gvimrc| script is loaded

runtime/doc/tags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4620,6 +4620,7 @@ E952 autocmd.txt /*E952*
46204620
E953 eval.txt /*E953*
46214621
E954 options.txt /*E954*
46224622
E955 eval.txt /*E955*
4623+
E956 pattern.txt /*E956*
46234624
E96 diff.txt /*E96*
46244625
E97 diff.txt /*E97*
46254626
E98 diff.txt /*E98*

runtime/doc/todo.txt

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ browser use: https://github.com/vim/vim/issues/1234
3838
*known-bugs*
3939
-------------------- Known bugs and current work -----------------------
4040

41-
Crash when ui_breakcheck() called from regexec() calls regexec() recursively.
42-
(Andy Massimino, #3175)
43-
Make regexp work recursively, store all globals in "rex"?
44-
4541
Prompt buffer:
4642
- Add a command line history.
4743
- delay next prompt until plugin gives OK?
@@ -81,6 +77,8 @@ Does not build with MinGW out of the box:
8177
- _stat64 is not defined, need to use "struct stat" in vim.h
8278
- WINVER conflict, should use 0x0600 by default?
8379

80+
Patches for Python: #3162, #3263 (Ozaki Kiichi)
81+
8482
Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
8583
13, #2910) Can't reproduce?
8684

@@ -96,29 +94,43 @@ Patch to fix that +packages is always in output of :version.
9694
More warnings from static analysis:
9795
https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
9896

97+
Patch for Perl 5.28 on Windows. (#3196)
98+
9999
Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
100100
Related to bracketed paste. I cannot reproduce it.
101101

102102
Patch replacing imp with importlib. (#3163)
103103

104+
Patch to make CTRL-S in mswin.vim work better. (#3211)
105+
But use "gi" instead of "a".
106+
104107
Using ":file" in quickfix window during an autocommand doesn't work.
105108
(Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
106109

107110
Patch in pull request #2967: Allow white space in sign text. (Ben Jackson)
108111

112+
Removing flags from 'cpoptions' breaks the Winbar buttons in termdebug.
113+
(Dominique Pelle, 2018 Jul 16)
114+
109115
Whenever the file name is "~" then expand('%:p') returns $HOME. (Aidan
110116
Shafran, 2018 Jun 23, #3072) Proposed patch by Aidan, 2018 Jun 24.
111117

112118
Patch to set w_set_curswant when setting the cursor in language interfaces.
113119
(David Hotham, 2018 Jun 22, #3060)
114120

121+
Problem with two buffers with the same name a/b, if it didn't exist before and
122+
is created outside of Vim. (dskloetg, 2018 Jul 16, #3219)
123+
115124
Patch to make CTRL-W <CR> work properly in a quickfix window. (Jason Franklin,
116125
2018 May 30)
117126

118-
Patch to make mode() return something different for Normal mode when coming
119-
from Insert mode with CTRL-O. (#3000)
127+
gethostbyname() is old, use getaddrinfo() if available. (#3227)
120128

121-
Patches for Python: #3162, #3263 (Ozaki Kiichi)
129+
matchaddpos() gets slow with many matches. Proposal by Rick Howe, 2018 Jul
130+
19.
131+
132+
Patch to make mode() return something different for Normal mode when coming
133+
from Insert mode with CTRL-O. (#3000) Useful for positioning the cursor.
122134

123135
Script generated by :mksession does not work well if there are windows with
124136
modified buffers
@@ -231,6 +243,10 @@ Does setting 'cursorline' cause syntax highlighting to slow down? Perhaps is
231243
mess up the cache? (Mike Lee Williams, 2018 Jan 27, #2539)
232244
Also: 'foldtext' is evaluated too often. (Daniel Hahler, #2773)
233245

246+
With 'foldmethod' "indent" and appending an empty line, what follows isn't
247+
included in the existing fold. Deleting the empty line and undo fixes it.
248+
(Oleg Koshovetc, 2018 Jul 15, #3214)
249+
234250
When using :packadd files under "later" are not used, which is inconsistent
235251
with packages under "start". (xtal8, #1994)
236252

@@ -256,6 +272,8 @@ confusing error message. (Wang Shidong, 2018 Jan 2, #2519)
256272

257273
Add the debug command line history to viminfo.
258274

275+
Issue #686: apply 'F' in 'shortmess' to more messages. Also #3221.
276+
259277
Avoid that "sign unplace id" does a redraw right away, esp. when there is a
260278
sequence of these commands. (Andy Stewart, 2018 Mar 16)
261279

runtime/doc/usr_05.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,9 @@ when you use Vim. There are only two steps for adding a global plugin:
344344
GETTING A GLOBAL PLUGIN
345345

346346
Where can you find plugins?
347+
- Some are always loaded, you can see them in the directory $VIMRUNTIME/plugin.
347348
- Some come with Vim. You can find them in the directory $VIMRUNTIME/macros
348-
and its sub-directories.
349+
and its sub-directories and under $VIM/vimfiles/pack/dist/opt/.
349350
- Download from the net. There is a large collection on http://www.vim.org.
350351
- They are sometimes posted in a Vim |maillist|.
351352
- You could write one yourself, see |write-plugin|.

0 commit comments

Comments
 (0)