Open h-east opened 6 years ago
vim-jp/vimdoc-ja-working#312
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -301,6 +301,7 @@ Name triggered by ~
|FileChangedShellPost| After handling a file changed since editing started
|FileChangedRO| before making the first change to a read-only file
+|DiffUpdated| after diffs have been updated
|DirChanged| after the working directory has changed
|ShellCmdPost| after executing a shell command
Fixed.
reset
は紛らわしいのでOff
にしました。
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a02618af4..21e2cab08 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1763,7 +1763,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
'compatible' 'cp' boolean (default on, off when a |vimrc| or |gvimrc|
- file is found, reset in |defaults.vim|)
+ file is found, off in |defaults.vim|)
global
{not in Vi}
This option has the effect of making Vim either more Vi-compatible, or
(追記: 却下。"set"と "reset"の使用は、defaults.vimに関する他の注釈と一貫しているとのこと)
defaults.vim でデフォルトのonをリセットするということで、動詞として reset にしてるのかな?
Vim 8.1.0436 runtime/doc/eval.txt:2463
一覧ではterm_start()の戻り値がJobとなっていますが、 ファンクションの説明にもある通り、戻り値はバッファ番号です。
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index a5c8a13e9..b63490de9 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2460,7 +2460,7 @@ term_setkill({buf}, {how}) none set signal to stop job in terminal
term_setrestore({buf}, {command}) none set command to restore terminal
term_setsize({buf}, {rows}, {cols})
none set the size of a terminal
-term_start({cmd}, {options}) Job open a terminal window and run a job
+term_start({cmd}, {options}) Number open a terminal window and run a job
term_wait({buf} [, {time}]) Number wait for screen to be updated
test_alloc_fail({id}, {countdown}, {repeat})
none make memory allocation fail
term_start({cmd}, {options}) *term_start()*
Open a terminal window and run {cmd} in it.
.
.
.
Returns the buffer number of the terminal window. If {cmd}
cannot be executed the window does open and shows an error
message.
If opening the window fails zero is returned.
Fixed.
vim 8.1.0393で 'diffopt' にオプション "iblank", "iwhiteall" および "iwhiteeol" が追加されたけど、ドキュメントの更新まだだなぁ。。(12日経過)
(追記: 最後のruntimeファイル更新が 2018/09/03 なので、次の更新で反映されていなかったら指摘する感じ) (追記2: 2018-10-02 のruntime更新でちゃんと更新されたので問題なし)
patch 8.1.0444の直前のruntimeファイル更新で報告分すべて反映されました:+1:
(各コメントの最終行に Fixed.
と追記させてもらってます)
helpファイルのmodeline (fo=tcq2:
)の件、vim_devに提案しました。
(Fixed. fo=tcq2:
が削除されました)
patch 8.1.0444の直前のruntimeファイル更新で報告分すべて反映されました+1 (各コメントの最終行に
Fixed.
と追記させてもらってます)
投げっぱなしすみません。。。ご確認いただきどうもありがとうございます!
noneの前が空白→タブ。
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fda3bd063..459feaa07 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2475,8 +2475,8 @@ test_null_job() Job null value for testing
test_null_list() List null value for testing
test_null_partial() Funcref null value for testing
test_null_string() String null value for testing
-test_option_not_set({name}) none reset flag indicating option was set
-test_override({expr}, {val}) none test with Vim internal overrides
+test_option_not_set({name}) none reset flag indicating option was set
+test_override({expr}, {val}) none test with Vim internal overrides
test_scrollbar({which}, {value}, {dragging})
none scroll in the GUI for testing
test_settime({expr}) none set current time for testing
Fixed.
patch 8.1.0484の直前のruntimeファイル更新で報告分反映されました。
(各コメントの最終行に Fixed.
等と追記してます)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0db2d465f..529738dc8 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1057,9 +1057,9 @@ A jump table for the options with a short description can be found at |Q_op|.
- To include a comma in a directory name precede it with a backslash.
- A directory name may end in an '/'.
- For Unix and Win32, if a directory ends in two path separators "//",
- the swap file name will be built from the complete path to the file
- with all path separators changed to percent '%' signs. This will
- ensure file name uniqueness in the backup directory.
+ the backup file name will be built from the complete path to the
+ file with all path separators changed to percent '%' signs. This
+ will ensure file name uniqueness in the backup directory.
On Win32, it is also possible to end with "\\". However, When a
separating comma is following, you must use "//", since "\\" will
include the comma in the file name. Therefore it is recommended to
@@ -2686,8 +2686,8 @@ A jump table for the options with a short description can be found at |Q_op|.
option to see when this happens.
indent-heuristic
- Use the indent heuristic for the internal
- diff library.
+ Use the indent heuristic for the internal
+ diff library.
algorithm:{text} Use the specified diff algorithm with the
internal diff engine. Currently supported
Fixed.
行末の余計な空白。2箇所。
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index b2105206b..ccca443d2 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1025,7 +1025,7 @@ remembered. You can return to that position with the "''" and "``" command,
unless the line containing that position was changed or deleted. The
following commands are "jump" commands: "'", "`", "G", "/", "?", "n", "N",
"%", "(", ")", "[[", "]]", "{", "}", ":s", ":tag", "L", "M", "H" and the
-commands that start editing a new file.
+commands that start editing a new file.
*CTRL-O*
CTRL-O Go to [count] Older cursor position in jump list
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0db2d465f..ac4982d4d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2690,7 +2690,7 @@ A jump table for the options with a short description can be found at |Q_op|.
diff library.
algorithm:{text} Use the specified diff algorithm with the
- internal diff engine. Currently supported
+ internal diff engine. Currently supported
algorithms are:
myers the default algorithm
minimal spend extra time to generate the
Fixed.
space 忘れ https://github.com/vim-jp/vimdoc-ja-working/pull/332
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index e7e510f3a..201232867 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -295,7 +295,7 @@ the "*" is under your right hand middle finger (search to the right and down).
*E956*
In very rare cases a regular expression is used recursively. This can happen
-when executing a pattern takes a long time and when checkig for messages on
+when executing a pattern takes a long time and when checking for messages on
channels a callback is invoked that also uses a pattern or an autocommand is
triggered. In most cases this should be fine, but if a pattern is in use when
it's used again it fails. Usually this means there is something wrong with
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index b060c4555..6110fbde3 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -515,7 +515,7 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
--clean Similar to "-u DEFAULTS -U NONE -i NONE":
- initializations from files and environment variables is
skipped
- -'runtimepath'and 'packpath' are set to exclude home
+ -'runtimepath' and 'packpath' are set to exclude home
directory entries (does not happen with -u DEFAULTS).
- the |defaults.vim| script is loaded, which implies
'nocompatible': use Vim defaults
Fixed.
indent.txt
if_perl.txt
gui.txt
eval.txt
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 2e58c854e..67b58cece 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2026,7 +2026,7 @@ append({lnum}, {text}) Number append {text} below line {lnum}
appendbufline({expr}, {lnum}, {text})
Number append {text} below line {lnum}
in buffer {expr}
-argc( [{winid}]) Number number of files in the argument list
+argc([{winid}]) Number number of files in the argument list
argidx() Number current index in the argument list
arglistid([{winnr} [, {tabnr}]]) Number argument list id
argv({nr} [, {winid}]) String {nr} entry of the argument list
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index c621b40cb..565f8a518 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -878,7 +878,7 @@ be used to complete the name of the menu item.
't': |:tlmenu| Terminal mode
'i': |:imenu| Insert mode
'c': |:cmenu| Cmdline mode
-
+
If the console-mode vim has been compiled with WANT_MENU defined, you can
use :emenu to access useful menu items you may have got used to from GUI
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index a4df06a9b..26ea29e0d 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -45,8 +45,8 @@ The Perl patches for Vim were made by:
Matt Gerassimof
Perl for MS-Windows (and other platforms) can be found at:
-http://www.perl.org/ The ActiveState one should work, Strawberry Perl is a
-good alternative.
+ http://www.perl.org/
+The ActiveState one should work, Strawberry Perl is a good alternative.
==============================================================================
3. Using the Perl interface *perl-using*
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index a8d59e370..37aa16ff0 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -602,14 +602,14 @@ the use of square and curly brackets, and otherwise by community convention.
These conventions are not universally followed, so the Clojure indent script
offers a few configurable options, listed below.
-If the current vim does not include searchpairpos(), the indent script falls
+If the current vim does not include |searchpairpos()|, the indent script falls
back to normal 'lisp' indenting, and the following options are ignored.
*g:clojure_maxlines*
-Set maximum scan distance of searchpairpos(). Larger values trade performance
-for correctness when dealing with very long forms. A value of 0 will scan
-without limits.
+Set maximum scan distance of |searchpairpos()|. Larger values trade
+performance for correctness when dealing with very long forms. A value of 0
+will scan without limits.
>
" Default
let g:clojure_maxlines = 100
@@ -941,8 +941,8 @@ Indent after a nested paren: >
Indent for a continuation line: >
let g:pyindent_continue = '&sw * 2'
-The method uses searchpair() to look back for unclosed parenthesis. This can
-sometimes be slow, thus it timeouts after 150 msec. If you notice the
+The method uses |searchpair()| to look back for unclosed parenthesis. This
+can sometimes be slow, thus it timeouts after 150 msec. If you notice the
indenting isn't correct, you can set a larger timeout in msec: >
let g:pyindent_searchpair_timeout = 500
Fixed.
from vim-jp/vimdoc-ja-working#344
ドキュメント内の &sw
を可能ならば shiftwidth()
に置換え。
(eval.txt に1箇所残っているが、これは &sw
のままでOK)
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index a8d59e370..d161882d0 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -935,11 +935,11 @@ given are the defaults. Note that the variables are set to an expression, so
that you can change the value of 'shiftwidth' later.
Indent after an open paren: >
- let g:pyindent_open_paren = '&sw * 2'
+ let g:pyindent_open_paren = 'shiftwidth() * 2'
Indent after a nested paren: >
- let g:pyindent_nested_paren = '&sw'
+ let g:pyindent_nested_paren = 'shiftwidth()'
Indent for a continuation line: >
- let g:pyindent_continue = '&sw * 2'
+ let g:pyindent_continue = 'shiftwidth() * 2'
The method uses searchpair() to look back for unclosed parenthesis. This can
sometimes be slow, thus it timeouts after 150 msec. If you notice the
@@ -1038,7 +1038,7 @@ Furthermore, setting the variable b:verilog_indent_width to change the
indenting width (default is 'shiftwidth'): >
let b:verilog_indent_width = 4
- let b:verilog_indent_width = &sw * 2
+ let b:verilog_indent_width = shiftwidth() * 2
In addition, you can turn the verbose mode for debug issue: >
@@ -1161,7 +1161,7 @@ VIM *ft-vim-indent*
For indenting Vim scripts there is one variable that specifies the amount of
indent for a continuation line, a line that starts with a backslash: >
- :let g:vim_indent_cont = &sw * 3
+ :let g:vim_indent_cont = shiftwidth() * 3
Three times shiftwidth is the default value.
Fixed.
組み込み関数名をmarkup.
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 75a5b114a..e6589c70b 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -179,8 +179,8 @@ commands explained above the tag stack will look like this:
1 1 main 1 harddisk2:text/vim/test
2 1 FuncB 59 harddisk2:text/vim/src/main.c
-The gettagstack() function returns the tag stack of a specified window. The
-settagstack() function modifies the tag stack of a window.
+The |gettagstack()| function returns the tag stack of a specified window. The
+|settagstack()| function modifies the tag stack of a window.
*E73*
When you try to use the tag stack while it doesn't contain anything you will
Fixed.
patch 8.1.0528の直前のruntimeファイル更新で報告分すべて反映されました。:+1:
(各コメントの最終行に Fixed.
等と追記してます)
from https://github.com/vim-jp/vimdoc-ja-working/pull/383
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 774e78227..0e6a8b293 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -7339,7 +7339,7 @@ A jump table for the options with a short description can be found at |Q_op|.
After this option has been set successfully, Vim will source the files
"spell/LANG.vim" in 'runtimepath'. "LANG" is the value of 'spelllang'
- up to the first character that is not an ASCII letter or number and
+ up to the first character that is not an ASCII alphabet or number and
not a dash. Also see |set-spc-auto|.
却下。
Bram氏がI think "letter" is correct here.
と回答したので。
https://groups.google.com/d/msg/vim_dev/OhVliWUgT44/qPAv1tuyEQAJ
余分な空白。
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index c7e595586..896950511 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1059,7 +1059,7 @@ Various: *various-functions*
py3eval() evaluate Python expression (|+python3|)
pyeval() evaluate Python expression (|+python|)
pyxeval() evaluate |python_x| expression
- debugbreak() interrupt a program being debugged
+ debugbreak() interrupt a program being debugged
==============================================================================
*41.7* Defining a function
Fixed.
https://github.com/vim-jp/vimdoc-ja-working/pull/385#discussion_r237818314 xterm 277 以上か、Mac Terminal.app or iTerm2の場合にsgrが有効になるはず。
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -8454,7 +8454,7 @@ A jump table for the options with a shor
number, more intelligent detection process runs.
The "xterm2" value will be set if the xterm version is reported to be
from 95 to 276. The "sgr" value will be set if the xterm version is
- 277 or higher and when Vim detects Mac Terminal.app or iTerm2.
+ 277 or higher or when Vim detects Mac Terminal.app or iTerm2.
If you do not want 'ttymouse' to be set to "xterm2" or "sgr"
automatically, set t_RV to an empty string: >
:set t_RV=
"or" が続くのは英文として正しいのか微妙な感じがしますが…。
(edit) 原文が更新されたものの and が使われている点は変化がなかったので、翻訳時の解釈にて対応。 https://github.com/vim-jp/vimdoc-ja-working/pull/389#discussion_r240072134
from https://github.com/vim-jp/vimdoc-ja-working/pull/390 行末の余分な空白(2か所)
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index d43afe9df..810df334f 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1279,7 +1279,7 @@ intended! Calling a function may be an alternative.
Completion behavior ~
- *:command-completion* *E179* *E180* *E181*
+ *:command-completion* *E179* *E180* *E181*
*:command-complete*
By default, the arguments of user defined commands do not undergo completion.
However, by specifying one or the other of the following attributes, argument
@@ -1407,7 +1407,7 @@ Possible values are:
-addr=loaded_buffers Range for loaded buffers
-addr=windows Range for windows
-addr=tabs Range for tab pages
- -addr=other other kind of range
+ -addr=other other kind of range
Special cases ~
Fixed.
from https://github.com/vim-jp/vimdoc-ja-working/pull/391
<
忘れ。
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 21fc43aaa..53641360a 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1104,7 +1104,7 @@ Or, if you don't want to write them in as floating-point literals, you can
also use functions, like the following: >
:let pi = acos(-1.0)
:let e = exp(1.0)
-
+<
*floating-point-precision*
The precision and range of floating points numbers depends on what "double"
means in the library Vim was compiled with. There is no way to change this at
Fixed. patch 8.1.0579 で直りました。 https://github.com/vim/vim/commit/98aefe7c3250bb5d4153b994f878594d1745424e#diff-bea881dfa9626bab7141337b0fcdb23eR1107
<
忘れ。
報告が上がりました。 https://groups.google.com/d/topic/vim_dev/uMCE2CuI3L0/discussion
ソースコードの出現順に合わせました&抜けを直しました&Pmenu関連の空白文字調整。
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b5278f16b..2c5bffa17 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4133,11 +4133,12 @@ A jump table for the options with a short description can be found at |Q_op|.
l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,
N:CursorLineNr,r:Question,s:StatusLine,
S:StatusLineNC,c:VertSplit,t:Title,
- v:Visual,w:WarningMsg,W:WildMenu,f:Folded,
- F:FoldColumn,A:DiffAdd,C:DiffChange,
- D:DiffDelete,T:DiffText,>:SignColumn,
+ v:Visual,V:VisualNOS,w:WarningMsg,
+ W:WildMenu,f:Folded,F:FoldColumn,
+ A:DiffAdd,C:DiffChange,D:DiffDelete,
+ T:DiffText,>:SignColumn,-:Conceal,
B:SpellBad,P:SpellCap,R:SpellRare,
- L:SpellLocal,-:Conceal,+:Pmenu,=:PmenuSel,
+ L:SpellLocal,+:Pmenu,=:PmenuSel,
x:PmenuSbar,X:PmenuThumb,*:TabLine,
#:TabLineSel,_:TabLineFill,!:CursorColumn,
.:CursorLine,o:ColorColumn,q:QuickFixLine,
@@ -4182,16 +4183,16 @@ A jump table for the options with a short description can be found at |Q_op|.
|hl-DiffDelete| D deleted line in diff mode
|hl-DiffText| T inserted text in diff mode
|hl-SignColumn| > column used for |signs|
+ |hl-Conceal| - the placeholders used for concealed characters
+ (see 'conceallevel')
|hl-SpellBad| B misspelled word |spell|
|hl-SpellCap| P word that should start with capital |spell|
|hl-SpellRare| R rare word |spell|
|hl-SpellLocal| L word from other region |spell|
- |hl-Conceal| - the placeholders used for concealed characters
- (see 'conceallevel')
- |hl-Pmenu| + popup menu normal line
- |hl-PmenuSel| = popup menu normal line
- |hl-PmenuSbar| x popup menu scrollbar
- |hl-PmenuThumb| X popup menu scrollbar thumb
+ |hl-Pmenu| + popup menu normal line
+ |hl-PmenuSel| = popup menu selected line
+ |hl-PmenuSbar| x popup menu scrollbar
+ |hl-PmenuThumb| X popup menu scrollbar thumb
The display modes are:
r reverse (termcap entry "mr" and "me")
Fixed.
from https://github.com/vim-jp/vimdoc-ja-working/pull/386#issuecomment-445624815
!
の説明追加。
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 6e652202b..687f8e7cf 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -336,6 +336,8 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
:scr[iptnames][!] {scriptId} *:script*
Edit script {scriptId}. Suggested name is ":script".
+ When the current buffer can't be |abandon|ed and the !
+ is not present, the command fails.
*:fini* *:finish* *E168*
:fini[sh] Stop sourcing a script. Can only be used in a Vim
Fixed.
from https://github.com/vim-jp/vimdoc-ja-working/pull/395 行末の余分な空白
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4e80f4a97..79931277a 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6772,7 +6772,7 @@ prop_list({lnum} [, {props}]) *prop_list()*
*prop_remove()* *E968*
-prop_remove({props} [, {lnum} [, {lnum_end}]])
+prop_remove({props} [, {lnum} [, {lnum_end}]])
Remove a matching text property from line {lnum}. When
{lnum_end} is given, remove matching text properties from line
{lnum} to {lnum_end} (inclusive).
Fixed.
from https://github.com/vim-jp/vimdoc-ja-working/pull/395
or -> nor
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4e80f4a97..3215135f7 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6688,7 +6688,7 @@ prop_add({lnum}, {col}, {props})
"end_lnum" - line number for end of text
"end_col" - column for end of text; not used when
"length" is present
- "bufnr - buffer to add the property to; when
+ "bufnr" - buffer to add the property to; when
omitted the current buffer is used
"id" - user defined ID for the property; when
omitted zero is used
@@ -6699,7 +6699,7 @@ prop_add({lnum}, {col}, {props})
are passed. Either use "length" or "end_col" for a property
within one line, or use "end_lnum" and "end_col" for a
property that spans more than one line.
- When neither "length" or "end_col" are passed the property
+ When neither "length" nor "end_col" are passed the property
will apply to one character.
"type" will first be looked up in the buffer the property is
Fixed.
修正予定とのこと
昨日 h-east さんがご自身の patch を修正されていて、そのうちここに上がるかと待っていたけど(まだ?)来ないので。
https://github.com/vim-jp/vimdoc-ja-working/pull/393/commits/d937db5a4a5dfbdba137d871f851cc02c46fa79b#diff-7fef4be4682a6cc91e3b26963ae3f435R75
diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt
index c88ca37b8..9603a3598 100644
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -72,8 +72,8 @@ Suppose line 11 in a buffer has this text (excluding the indent):
To highlight the numbers: >
call prop_type_add('number', {'highlight': 'Constant'})
- call prop_add(11, 12, {'length': 3, 'type': 'number})
- call prop_add(11, 32, {'length': 4, 'type': 'number})
+ call prop_add(11, 12, {'length': 3, 'type': 'number'})
+ call prop_add(11, 32, {'length': 4, 'type': 'number'})
Setting "start_incl" and "end_incl" is useful when white space surrounds the
text, e.g. for a function name. Using false is useful when the text starts
Fixed.
@mnishz あぁ、まっつんさんが指摘してて、Bram氏もI'll fix that.
って言ってるので、改めて報告しなくてもいいやと判断してました。
https://github.com/vim/vim/commit/98aefe7c3250bb5d4153b994f878594d1745424e#r31675087
@h-east さん、 おおおぉぉ、それは失礼いたしました。追えていなかった。
お気になさらず。vim_devのスレッドを全部読む人って暇人か変態なので。ちなみに私は全部は読んでません。
s/lnum_/lnum-/g の修正漏れ
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2325,7 +2325,7 @@ prop_clear({lnum} [, {lnum-end} [, {bufn
prop_find({props} [, {direction}])
Dict search for a text property
prop_list({lnum} [, {props}) List text properties in {lnum}
-prop_remove({props} [, {lnum} [, {lnum_end}]])
+prop_remove({props} [, {lnum} [, {lnum-end}]])
Number remove a text property
prop_type_add({name}, {props}) none define a new property type
prop_type_change({name}, {props})
@@ -6791,10 +6791,10 @@ prop_list({lnum} [, {props}]) *prop_
*prop_remove()* *E968*
-prop_remove({props} [, {lnum} [, {lnum_end}]])
+prop_remove({props} [, {lnum} [, {lnum-end}]])
Remove a matching text property from line {lnum}. When
- {lnum_end} is given, remove matching text properties from line
- {lnum} to {lnum_end} (inclusive).
+ {lnum-end} is given, remove matching text properties from line
+ {lnum} to {lnum-end} (inclusive).
When {lnum} is omitted remove matching text properties from
all lines.
Fixed.
行頭に余分なスペース。 (Bram氏のmergeミス)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 3af7150c6..a8b7f47af 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4137,7 +4137,7 @@ A jump table for the options with a short description can be found at |Q_op|.
W:WildMenu,f:Folded,F:FoldColumn,
A:DiffAdd,C:DiffChange,D:DiffDelete,
T:DiffText,>:SignColumn,-:Conceal,
- B:SpellBad,P:SpellCap,R:SpellRare,
+ B:SpellBad,P:SpellCap,R:SpellRare,
L:SpellLocal,+:Pmenu,=:PmenuSel,
x:PmenuSbar,X:PmenuThumb,*:TabLine,
#:TabLineSel,_:TabLineFill,!:CursorColumn,
Fixed.
章番号の後ろに余計なスペース。
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 29fae2c3f..e8634a799 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -29,7 +29,7 @@ In the User Manual:
7. :syntax arguments |:syn-arguments|
8. Syntax patterns |:syn-pattern|
9. Syntax clusters |:syn-cluster|
-10. Including syntax files |:syn-include|
+10. Including syntax files |:syn-include|
11. Synchronizing |:syn-sync|
12. Listing syntax items |:syntax|
13. Highlight command |:highlight|
Fixed.
これもか。
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -103,11 +103,11 @@ prop_type_list([{props}]) get list of p
Manipulating text properties:
prop_add({lnum}, {col}, {props}) add a text property
-prop_clear({lnum} [, {lnum_end} [, {bufnr}]])
+prop_clear({lnum} [, {lnum-end} [, {bufnr}]])
remove all text properties
prop_find({props} [, {direction}]) search for a text property
prop_list({lnum} [, {props}) text properties in {lnum}
-prop_remove({props} [, {lnum} [, {lnum_end}]])
+prop_remove({props} [, {lnum} [, {lnum-end}]])
remove a text property
Fixed.
"
抜け。指摘&修正されたのはprop_add()
。で、prop_find()
も抜けてた。
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index afc4fe134..9579682a4 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6725,7 +6725,7 @@ prop_find({props} [, {direction}])
Search for a text property as specified with {props}:
"id" property with this ID
"type" property with this type name
- "bufnr buffer to search in; when present a
+ "bufnr" buffer to search in; when present a
start position with "lnum" and "col"
must be given; when omitted the
current buffer is used
(追記)
eval.txtの prop*() と sign*() はエントリー名を "
で囲むのをやめて、ネストは本文からスペース3カラムになるように統一された。
from https://github.com/vim-jp/vimdoc-ja-working/pull/413
・sign_define()
の{dict}のエントリ名のインデントが変。
・sign_getplaced()
の例に余計な'
が2箇所。
・sign_place()
に余計な空白だけの行がある。
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index cb1c61bed..03d2deeb8 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7881,12 +7881,12 @@ sign_define({name} [, {dict}]) *sign_define()*
The {name} can be a String or a Number. The optional {dict}
argument specifies the sign attributes. The following values
are supported:
- icon full path to the bitmap file for the sign.
- linehl highlight group used for the whole line the
+ icon full path to the bitmap file for the sign.
+ linehl highlight group used for the whole line the
sign is placed in.
- text text that is displayed when there is no icon
+ text text that is displayed when there is no icon
or the GUI is not being used.
- texthl highlight group used for the text item
+ texthl highlight group used for the text item
For an existing sign, the attributes are updated.
Returns 0 on success and -1 on failure.
@@ -7969,11 +7969,11 @@ sign_getplaced([{expr} [, {dict}]]) *sign_getplaced()*
echo sign_getplaced("eval.c", {'lnum' : 10})
" Get sign with identifier 10 placed in a.py
- echo sign_getplaced("a.py", {'id' : 10'})
+ echo sign_getplaced("a.py", {'id' : 10})
" Get sign with id 20 in group 'g1' placed in a.py
echo sign_getplaced("a.py", {'group' : 'g1',
- \ 'id' : 20'})
+ \ 'id' : 20})
" Get a List of all the placed signs
echo sign_getplaced()
@@ -7989,7 +7989,7 @@ sign_place({id}, {group}, {name}, {expr} [, {dict}])
the sign group name. To use the global sign group, use an
empty string. {group} functions as a namespace for {id}, thus
two groups can use the same IDs.
-
+
{name} refers to a defined sign.
{expr} refers to a buffer name or number. For the accepted
values, see |bufname()|.
(追記) エントリー名のインデントについては前のコメントの通り。その他はFixed.
Report to vim_dev with patch. https://groups.google.com/d/msg/vim_dev/3Rr7JA49gpQ/6zJkohyzEwAJ
eval.txt: 余計な "
quickfix.txt: 80桁超え
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1567ec814..6d0a30f74 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6746,7 +6746,7 @@ prop_find({props} [, {direction}])
start position with "lnum" and "col"
must be given; when omitted the
current buffer is used
- lnum" start in this line (when omitted start
+ lnum start in this line (when omitted start
at the cursor)
col start at this column (when omitted
and "lnum" is given: use column 1,
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 471c5f96e..06572b371 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1551,7 +1551,7 @@ The backslashes before the pipe character are required to avoid it to be
recognized as a command separator. The backslash before each space is
required for the set command.
- *cfilter-plugin* *:Cfilter* *:Lfilter*
+ *cfilter-plugin* *:Cfilter* *:Lfilter*
If you have too many matching messages, you can use the cfilter plugin to
reduce the number of entries. Load the plugin with: >
packadd cfilter
Fixed.
前後の他の説明を見た感じでは、"Remove placed signs" -> "Remove all placed signs" が正しいように思います。 https://github.com/vim-jp/vimdoc-ja-working/pull/412#discussion_r244551939
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 166c3a48b..df7e078af 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -251,13 +251,13 @@ See |sign_unplace()| for the equivalent Vim script function.
all the files it appears in.
:sign unplace *
- Remove placed signs in the global group from all the files.
+ Remove all placed signs in the global group from all the files.
:sign unplace * group={group}
- Remove placed signs in group {group} from all the files.
+ Remove all placed signs in group {group} from all the files.
:sign unplace * group=*
- Remove placed signs in all the groups from all the files.
+ Remove all placed signs in all the groups from all the files.
:sign unplace
Remove a placed sign at the cursor position. If multiple signs
Fixed.
from https://github.com/vim-jp/vimdoc-ja-working/pull/421 スペースが混じっている
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5d9e7b2f1..d6e2053d7 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6327,7 +6327,7 @@ mode([expr]) Return a string that indicates the current mode.
nov Operator-pending (forced characterwise |o_v|)
noV Operator-pending (forced linewise |o_V|)
noCTRL-V Operator-pending (forced blockwise |o_CTRL-V|);
- CTRL-V is one character
+ CTRL-V is one character
niI Normal using |i_CTRL-O| in |Insert-mode|
niR Normal using |i_CTRL-O| in |Replace-mode|
niV Normal using |i_CTRL-O| in |Virtual-Replace-mode|
@@ -6703,7 +6703,7 @@ prop_add({lnum}, {col}, {props})
is present; when {col} and "end_col" are equal
this is a zero-width text property
bufnr buffer to add the property to; when omitted
- the current buffer is used
+ the current buffer is used
id user defined ID for the property; when omitted
zero is used
type name of the text property type
Fixed.
https://github.com/vim-jp/vimdoc-ja-working/pull/357#discussion_r244626172 おそらく間違いかと。
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -577,7 +577,7 @@ 2. Use Vimdiff to see what changed: >
vimdiff xx_YY.orig.dic xx_YY.new.dic
3. Take over the changes you like in xx_YY.dic.
You may also need to change xx_YY.aff.
-4. Rename xx_YY.new.dic to xx_YY.orig.dic and xx_YY.new.aff to xx_YY.new.aff.
+4. Rename xx_YY.new.dic to xx_YY.orig.dic and xx_YY.new.aff to xx_YY.orig.aff.
SPELL FILE VERSIONS *E770* *E771* *E772*
Fixed.
from https://github.com/vim-jp/vimdoc-ja-working/pull/431
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 4abd25aa0..40670ba1b 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1459,6 +1459,7 @@ tag command action ~
|:redir| :redi[r] redirect messages to a file or register
|:redraw| :redr[aw] force a redraw of the display
|:redrawstatus| :redraws[tatus] force a redraw of the status line(s)
+|:redrawtabline| :redrawt[abline] force a redraw of the tabline
|:registers| :reg[isters] display the contents of registers
|:resize| :res[ize] change current window height
|:retab| :ret[ab] change tab size
Fixed.
~端末ノーマルモードでの表示がドキュメントと異なっているように見えます。~ 括弧の種類の違いはありますが、ターミナルからジョブを直接起動した場合の表示は確かにヘルプの通りでした。取り下げいたします。
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 0db69df7d..0ec036695 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -322,9 +322,9 @@ contents of the buffer. The commands that would start insert mode, such as
'i' and 'a', return to Terminal-Job mode. The window will be updated to show
the contents of the terminal. |:startinsert| is ineffective.
-In Terminal-Normal mode the statusline and window title show "(Terminal)". If
+In Terminal-Normal mode the statusline and window title show "[Terminal]". If
the job ends while in Terminal-Normal mode this changes to
-"(Terminal-finished)".
+"[finished]".
When the job outputs lines in the terminal, such that the contents scrolls off
the top, those lines are remembered and can be seen in Terminal-Normal mode.
from https://github.com/vim-jp/vimdoc-ja-working/pull/434
v:none
とcomplete()
をマークアップ。
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index e01eac932..d5594de23 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1078,7 +1078,8 @@ that contains the List. The Dict can have these items:
leading text is changed.
If you want to suppress the warning message for an empty result, return
-v:none. This is useful to implement asynchronous completion with complete().
+|v:none|. This is useful to implement asynchronous completion with
+|complete()|.
Other items are ignored.
Fixed.
from https://github.com/vim-jp/vimdoc-ja-working/pull/433
typo、:
有り表記に統一、capitalizing
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b9c9ca42a..00baf841c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1026,7 +1026,7 @@ If expr8 is a |Blob| this results in a new |Blob| with the bytes in the
indexes expr1a and expr1b, inclusive. Examples: >
:let b = 0zDEADBEEF
:let bs = b[1:2] " 0zADBE
- :let bs = b[] " copy ov 0zDEADBEEF
+ :let bs = b[] " copy of 0zDEADBEEF
Using expr8[expr1] or expr8[expr1a : expr1b] on a |Funcref| results in an
error.
@@ -9565,10 +9565,10 @@ type({expr}) The result is a Number representing the type of {expr}.
Dictionary: 4 |v:t_dict|
Float: 5 |v:t_float|
Boolean: 6 |v:t_bool| (v:false and v:true)
- None 7 |v:t_none| (v:null and v:none)
- Job 8 |v:t_job|
- Channel 9 |v:t_channel|
- Blob 10 |v:t_blob|
+ None: 7 |v:t_none| (v:null and v:none)
+ Job: 8 |v:t_job|
+ Channel: 9 |v:t_channel|
+ Blob: 10 |v:t_blob|
For backward compatibility, this method can be used: >
:if type(myvar) == type(0)
:if type(myvar) == type("")
@@ -10630,7 +10630,7 @@ This does NOT work: >
can do that like this: >
:let var = var[0:2] . 'X' . var[4:]
< When {var-name} is a |Blob| then {idx} can be the
- length of the blob, in which case one byte is
+ length of the Blob, in which case one byte is
appended.
*E711* *E719*
(1つ目のみFixed)
最後以外はFixed.
最後のCapitalizeは後でまとめて報告します。
本家help(runtime/doc/*.txt)のtypoを報告するスレです。 その都度vim_devに報告するとウザいのである程度溜まってから報告します。
typo発見時のVimバージョン(8.1.xxxx)も添えていただけると助かります。
関連: #1032