Runtime file and translation updates.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 0a142e4..de4bb02 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -9121,22 +9121,16 @@
Example: >
:if has("gui_running")
< *has-patch*
-3. Included patches. The "patch123" feature means that patch 123 has been
- included. Note that this form does not check the version of Vim, you need
- to inspect |v:version| for that.
- Example (checking version 6.2.148 or later): >
- :if v:version > 602 || v:version == 602 && has("patch148")
-< Note that it's possible for patch 147 to be omitted even though 148 is
- included.
-
-4. Beyond a certain version or at a certain version and including a specific
- patch. The "patch-7.4.237" feature means that the Vim version is 7.5 or
- later, or it is version 7.4 and patch 237 was included.
- Note that this only works for patch 7.4.237 and later, before that you
- need to use the example above that checks v:version. Example: >
+3. Beyond a certain version or at a certain version and including a specific
+ patch. The "patch-7.4.248" feature means that the Vim version is 7.5 or
+ later, or it is version 7.4 and patch 248 was included. Example: >
:if has("patch-7.4.248")
-< Note that it's possible for patch 147 to be omitted even though 148 is
- included.
+< Note that it's possible for patch 248 to be omitted even though 249 is
+ included. Only happens when cherry-picking patches.
+ Note that this form only works for patch 7.4.237 and later, before that
+ you need to check for the patch and the v:version. Example (checking
+ version 6.2.148 or later): >
+ :if v:version > 602 || (v:version == 602 && has("patch148"))
Hint: To find out if Vim supports backslashes in a file name (MS-Windows),
use: `if exists('+shellslash')`
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index eda14bc..13ab355 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -39,9 +39,10 @@
-------------------- Known bugs and current work -----------------------
Terminal emulator window:
-- Win32: Termdebug doesn't work, because gdb does not support mi2. This
- plugin: https://github.com/cpiger/NeoDebug runs gdb as a job, redirecting
- input and output. Command I/O is in gdb window.
+- Win32: Termdebug doesn't work, because gdb does not support mi2.
+ This plugin: https://github.com/cpiger/NeoDebug runs gdb as a job,
+ redirecting input and output.
+ Open new console for for program with: "set new-console on"
- Win32: Redirecting input does not work, half of Test_terminal_redir_file()
is disabled.
- Win32: Redirecting output works but includes escape sequences.
@@ -65,6 +66,8 @@
Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
13, #2910) Can't reproduce?
+Deprecate using has("patch213") always include the version number.
+
On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
(Nobuhiro Takasaki, #2833) Also check t_Co.
diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 8634c28..c091063 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -22104,7 +22104,7 @@
Patch 8.0.1238
Problem: Incremental search only shows one match.
Solution: When 'incsearch' and 'hlsearch' are both set highlight all
- matches. (haya14busa, itchyny closes #2198)
+ matches. (haya14busa, itchyny, closes #2198)
Files: runtime/doc/options.txt, src/ex_getln.c, src/proto/search.pro,
src/search.c, src/testdir/test_search.vim
@@ -22595,7 +22595,7 @@
Files: src/os_macosx.m
Patch 8.0.1316 (after 8.0.1312)
-Problem: Build still fails on Mac. (chdiza)
+Problem: Build still still fails on Mac. (chdiza)
Solution: Remove another bogus typedef.
Files: src/os_mac_conv.c
diff --git a/runtime/doc/vim-ja.UTF-8.1 b/runtime/doc/vim-ja.UTF-8.1
index 7742356..5b7798b 100644
--- a/runtime/doc/vim-ja.UTF-8.1
+++ b/runtime/doc/vim-ja.UTF-8.1
@@ -280,7 +280,7 @@
ぐことができます。
ファイルを保存したい場合は、":w!" のように、Ex コマンドに感嘆符を付けてくだ
さい。
-\-R オプションは \-n オプションの効果も含んでいます (下記参照)。
+\-R オプションは \-n オプションの効果も含んでいます (上記参照)。
オプション 'readonly' は ":set noro" でオフにできます。
詳しくは ":help 'readonly'" を参照してください。
.TP
diff --git a/runtime/doc/xxd-ja.UTF-8.1 b/runtime/doc/xxd-ja.UTF-8.1
index a4cc583..47688f8 100644
--- a/runtime/doc/xxd-ja.UTF-8.1
+++ b/runtime/doc/xxd-ja.UTF-8.1
@@ -76,6 +76,9 @@
.RI < cols >
オクテットで出力する。標準設定は 16 (\-i: 12, \-ps: 30, \-b: 6)。最大 256。
.TP
+.IR \-C " | " \-capitalize
+\-i を使用した際に、C インクルードファイル形式の変数名を大文字にする。
+.TP
.IR \-E " | " \-EBCDIC
右端に出力される文字のエンコーディングを ASCII から EBCDIC に変更する。
16 進ダンプの出力形式は変更されません。
diff --git a/runtime/lang/menu_ja.euc-jp.vim b/runtime/lang/menu_ja.euc-jp.vim
index 0eff4d9..4dcd60c 100644
--- a/runtime/lang/menu_ja.euc-jp.vim
+++ b/runtime/lang/menu_ja.euc-jp.vim
@@ -5,5 +5,5 @@
" Copyright (C) 2004,12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
-" eucjp is the same as euc-jp. Source the other one from here.
+" ja is the same as ja_jp. Source the other one from here.
source <sfile>:p:h/menu_ja_jp.euc-jp.vim
diff --git a/runtime/lang/menu_ja.utf-8.vim b/runtime/lang/menu_ja.utf-8.vim
index 105a199..a47cdbe 100644
--- a/runtime/lang/menu_ja.utf-8.vim
+++ b/runtime/lang/menu_ja.utf-8.vim
@@ -1,4 +1,4 @@
" Menu Translations: Japanese
-" eucjp is the same as euc-jp. Source the other one from here.
+" ja is the same as ja_jp. Source the other one from here.
source <sfile>:p:h/menu_ja_jp.utf-8.vim
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index 3448e0d..6e81f8f 100644
--- a/runtime/lang/menu_ja_jp.euc-jp.vim
+++ b/runtime/lang/menu_ja_jp.euc-jp.vim
@@ -73,9 +73,9 @@
menutrans &Global\ Settings Á´ÂÎÀßÄê(&G)
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!
\ ¥Ñ¥¿¡¼¥ó¶¯Ä´ÀÚÂØ(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!
\ Â羮ʸ»ú¶èÊÌÀÚÂØ(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!
\ ¥Þ¥Ã¥Áɽ¼¨ÀÚÂØ(&S)<Tab>:set\ sm!
menutrans &Context\ lines ¥«¡¼¥½¥ë¼þÊÕ¹Ô¿ô(&C)
menutrans &Virtual\ Edit ²¾ÁÛÊÔ½¸(&V)
@@ -86,7 +86,7 @@
menutrans Always ¾ï»þ
menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!
\ ÁÞÆþ(½é¿´¼Ô)¥â¡¼¥ÉÀÚÂØ(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!
\ Vi¸ß´¹¥â¡¼¥ÉÀÚÂØ(&O)<Tab>:set\ cp!
menutrans Search\ &Path\.\.\. ¸¡º÷¥Ñ¥¹(&P)\.\.\.
menutrans Ta&g\ Files\.\.\. ¥¿¥°¥Õ¥¡¥¤¥ë(&G)\.\.\.
@@ -106,19 +106,19 @@
menutrans F&ile\ Settings ¥Õ¥¡¥¤¥ëÀßÄê(&I)
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!
\ ¹ÔÈÖ¹æɽ¼¨ÀÚÂØ(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!
\ ÁêÂйÔÈÖ¹æɽ¼¨ÀÚÂØ(&V)<Tab>:set\ rnu!
menutrans Toggle\ &List\ Mode<Tab>:set\ list!
\ ¥ê¥¹¥È¥â¡¼¥ÉÀÚÂØ(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!
\ ¹ÔÀÞÊÖ¤·ÀÚÂØ(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!
+menutrans Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!
\ ñ¸ìÀÞÊÖ¤·ÀÚÂØ(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!
\ ¥¿¥ÖŸ³«ÀÚÂØ(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!
\ ¼«Æ°»ú²¼¤²ÀÚÂØ(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!
\ C¸À¸ì»ú²¼¤²ÀÚÂØ(&C)<Tab>:set\ cin!
" other options
@@ -131,7 +131,9 @@
let g:menutrans_fileformat_dialog = "¥Õ¥¡¥¤¥ë½ÐÎϤκݤβþ¹Ôµ¹æ¤Î·Á¼°¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤."
let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n¥¥ã¥ó¥»¥ë(&C)"
+menutrans Show\ C&olor\ Schemes\ in\ Menu ¿§¥Æ¡¼¥Þ¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&O)
menutrans C&olor\ Scheme ¿§¥Æ¡¼¥ÞÁªÂò(&O)
+menutrans Show\ &Keymaps\ in\ Menu ¥¡¼¥Þ¥Ã¥×¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&K)
menutrans &Keymap ¥¡¼¥Þ¥Ã¥×(&K)
menutrans None ¤Ê¤·
@@ -153,7 +155,8 @@
menutrans &Close<Tab>:cclose ÊĤ¸¤ë(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEX¤ØÊÑ´¹(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEX¤«¤éµÕÊÑ´¹(&R)<Tab>%!xxd\ -r
-menutrans Se&T\ Compiler ¥³¥ó¥Ñ¥¤¥éÀßÄê(&T)
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu ¥³¥ó¥Ñ¥¤¥éÀßÄê¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&T)
+menutrans Se&t\ Compiler ¥³¥ó¥Ñ¥¤¥éÀßÄê(&T)
" Tools.Spelling Menu
menutrans &Spelling ¥¹¥Ú¥ê¥ó¥°(&S)
@@ -289,7 +292,7 @@
" Syntax menu
menutrans &Syntax ¥·¥ó¥¿¥Ã¥¯¥¹(&S)
-menutrans &Show\ filetypes\ in\ menu Âбþ·Á¼°¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&S)
+menutrans &Show\ File\ Types\ in\ Menu Âбþ·Á¼°¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&S)
menutrans Set\ '&syntax'\ only 'syntax'¤À¤±ÀßÄê(&S)
menutrans Set\ '&filetype'\ too 'filetype'¤âÀßÄê(&F)
menutrans &Off ̵¸ú²½(&O)
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index af15c0b..9dbc47c 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -73,9 +73,9 @@
menutrans &Global\ Settings 全体設定(&G)
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!
\ パターン強調切替(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!
\ 大小文字区別切替(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!
\ マッチ表示切替(&S)<Tab>:set\ sm!
menutrans &Context\ lines カーソル周辺行数(&C)
menutrans &Virtual\ Edit 仮想編集(&V)
@@ -86,7 +86,7 @@
menutrans Always 常時
menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!
\ 挿入(初心者)モード切替(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!
\ Vi互換モード切替(&O)<Tab>:set\ cp!
menutrans Search\ &Path\.\.\. 検索パス(&P)\.\.\.
menutrans Ta&g\ Files\.\.\. タグファイル(&G)\.\.\.
@@ -106,19 +106,19 @@
menutrans F&ile\ Settings ファイル設定(&I)
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!
\ 行番号表示切替(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!
\ 相対行番号表示切替(&V)<Tab>:set\ rnu!
menutrans Toggle\ &List\ Mode<Tab>:set\ list!
\ リストモード切替(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!
\ 行折返し切替(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!
+menutrans Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!
\ 単語折返し切替(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!
\ タブ展開切替(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!
\ 自動字下げ切替(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!
\ C言語字下げ切替(&C)<Tab>:set\ cin!
" other options
@@ -131,7 +131,9 @@
let g:menutrans_fileformat_dialog = "ファイル出力の際の改行記号の形式を選んでください."
let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nキャンセル(&C)"
+menutrans Show\ C&olor\ Schemes\ in\ Menu 色テーマをメニューに表示(&O)
menutrans C&olor\ Scheme 色テーマ選択(&O)
+menutrans Show\ &Keymaps\ in\ Menu キーマップをメニューに表示(&K)
menutrans &Keymap キーマップ(&K)
menutrans None なし
@@ -153,7 +155,8 @@
menutrans &Close<Tab>:cclose 閉じる(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEXへ変換(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEXから逆変換(&R)<Tab>%!xxd\ -r
-menutrans Se&T\ Compiler コンパイラ設定(&T)
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu コンパイラ設定をメニューに表示(&T)
+menutrans Se&t\ Compiler コンパイラ設定(&T)
" Tools.Spelling Menu
menutrans &Spelling スペリング(&S)
@@ -289,7 +292,7 @@
" Syntax menu
menutrans &Syntax シンタックス(&S)
-menutrans &Show\ filetypes\ in\ menu 対応形式をメニューに表示(&S)
+menutrans &Show\ File\ Types\ in\ Menu 対応形式をメニューに表示(&S)
menutrans Set\ '&syntax'\ only 'syntax'だけ設定(&S)
menutrans Set\ '&filetype'\ too 'filetype'も設定(&F)
menutrans &Off 無効化(&O)
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index 66c8166..a39d7da 100644
--- a/runtime/lang/menu_japanese_japan.932.vim
+++ b/runtime/lang/menu_japanese_japan.932.vim
@@ -73,9 +73,9 @@
menutrans &Global\ Settings SÌÝè(&G)
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!
\ p^[²ØÖ(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!
\ 嬶æÊØÖ(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!
\ }b`\¦ØÖ(&S)<Tab>:set\ sm!
menutrans &Context\ lines J[\üÓs(&C)
menutrans &Virtual\ Edit ¼zÒW(&V)
@@ -86,7 +86,7 @@
menutrans Always í
menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!
\ }ü(SÒ)[hØÖ(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!
\ ViÝ·[hØÖ(&O)<Tab>:set\ cp!
menutrans Search\ &Path\.\.\. õpX(&P)\.\.\.
menutrans Ta&g\ Files\.\.\. ^Ot@C(&G)\.\.\.
@@ -106,19 +106,19 @@
menutrans F&ile\ Settings t@CÝè(&I)
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!
\ sÔ\¦ØÖ(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!
\ ÎsÔ\¦ØÖ(&V)<Tab>:set\ rnu!
menutrans Toggle\ &List\ Mode<Tab>:set\ list!
\ Xg[hØÖ(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!
\ sÜÔµØÖ(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!
+menutrans Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!
\ PêÜÔµØÖ(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!
\ ^uWJØÖ(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!
\ ©®º°ØÖ(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!
\ C¾êº°ØÖ(&C)<Tab>:set\ cin!
" other options
@@ -131,7 +131,9 @@
let g:menutrans_fileformat_dialog = "t@CoÍÌÛÌüsLÌ`®ðIñž³¢."
let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nLZ(&C)"
+menutrans Show\ C&olor\ Schemes\ in\ Menu Fe[}ðj
[É\¦(&O)
menutrans C&olor\ Scheme Fe[}Ið(&O)
+menutrans Show\ &Keymaps\ in\ Menu L[}bvðj
[É\¦(&K)
menutrans &Keymap L[}bv(&K)
menutrans None ȵ
@@ -153,7 +155,8 @@
menutrans &Close<Tab>:cclose 妎(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEXÖÏ·(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEX©çtÏ·(&R)<Tab>%!xxd\ -r
-menutrans Se&T\ Compiler RpCÝè(&T)
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu RpCÝèðj
[É\¦(&T)
+menutrans Se&t\ Compiler RpCÝè(&T)
" Tools.Spelling Menu
menutrans &Spelling XyO(&S)
@@ -289,7 +292,7 @@
" Syntax menu
menutrans &Syntax V^bNX(&S)
-menutrans &Show\ filetypes\ in\ menu Î`®ðj
[É\¦(&S)
+menutrans &Show\ File\ Types\ in\ Menu Î`®ðj
[É\¦(&S)
menutrans Set\ '&syntax'\ only 'syntax'¾¯Ýè(&S)
menutrans Set\ '&filetype'\ too 'filetype'àÝè(&F)
menutrans &Off ³ø»(&O)
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index b932303..8cb63f2 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -18,9 +18,8 @@
¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Àµ¤·¤¯³Ø½¬¤¹¤ë¤Ë¤Ï¥³¥Þ¥ó¥É¤ò¼ÂºÝ¤Ë»î¤µ¤Ê¤±¤ì¤Ð
¤Ê¤é¤Ê¤¤¤Î¤Ç¤¹¡£Ê¸¾Ï¤òÆɤó¤À¤À¤±¤Ê¤é¤Ð¡¢¤¤Ã¤È˺¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹!
- ¤µ¤¡¡¢Caps¥í¥Ã¥¯(Shift-Lock)¥¡¼¤¬²¡¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤¿¸å¡¢²èÌ̤Ë
- ¥ì¥Ã¥¹¥ó1.1 ¤¬Á´Éôɽ¼¨¤µ¤ì¤ë¤È¤³¤í¤Þ¤Ç¡¢j ¥¡¼¤ò²¡¤·¤Æ¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ
- ¤·¤ç¤¦¡£
+ ¤µ¤¡¡¢Caps¥í¥Ã¥¯¥¡¼¤¬²¡¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤¿¸å¡¢²èÌ̤˥ì¥Ã¥¹¥ó1.1
+ ¤¬Á´Éôɽ¼¨¤µ¤ì¤ë¤È¤³¤í¤Þ¤Ç¡¢j ¥¡¼¤ò²¡¤·¤Æ¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 1.1: ¥«¡¼¥½¥ë¤Î°ÜÆ°
@@ -155,7 +154,7 @@
4. Êѹ¹¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤·¤Þ¤¹: :wq <ENTER>
- 5. ¥¹¥Æ¥Ã¥× 1 ¤Ç vimtutuor ¤ò½ªÎ»¤·¤¿¾ì¹ç¤Ï vimtutor ¤òºÆÅÙµ¯Æ°¤·¡¢°Ê²¼¤Î
+ 5. ¥¹¥Æ¥Ã¥× 1 ¤Ç vimtutor ¤ò½ªÎ»¤·¤¿¾ì¹ç¤Ï vimtutor ¤òºÆÅÙµ¯Æ°¤·¡¢°Ê²¼¤Î
Í×Ìó¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£
6. °Ê¾å¤Î¥¹¥Æ¥Ã¥×¤òÆɤó¤ÇÍý²ò¤·¤¿¾å¤Ç¤³¤ì¤ò¼Â¹Ô¤·¤Þ¤·¤ç¤¦¡£
diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index cc03472..1e70cbc 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -18,9 +18,8 @@
Ĩ©È¯êÎÈèܹñB³µwK·éÉÍR}hðÀÛɳȯêÎ
ÈçÈ¢ÌÅ·B¶ÍðÇñ¾¾¯ÈçÎA«ÁÆYêĵܢܷ!
- ³ACapsbN(Shift-Lock)L[ª³êĢȢ±ÆðmFµ½ãAæÊÉ
- bX1.1 ªS\¦³êéƱëÜÅAj L[ðµÄJ[\ðÚ®µÜ
- µå¤B
+ ³ACapsbNL[ª³êĢȢ±ÆðmFµ½ãAæÊÉbX1.1
+ ªS\¦³êéƱëÜÅAj L[ðµÄJ[\ðÚ®µÜµå¤B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 1.1: J[\ÌÚ®
@@ -155,7 +154,7 @@
4. ÏXðt@CÉÛ¶µÜ·: :wq <ENTER>
- 5. Xebv 1 Å vimtutuor ðI¹µ½êÍ vimtutor ðÄxN®µAȺÌ
+ 5. Xebv 1 Å vimtutor ðI¹µ½êÍ vimtutor ðÄxN®µAȺÌ
vñÖiÝܵå¤B
6. ÈãÌXebvðÇñÅðµ½ãűêðÀsµÜµå¤B
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index aca6cf7..fdca0eb 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -18,9 +18,8 @@
ておかなければなりません。正しく学習するにはコマンドを実際に試さなければ
ならないのです。文章を読んだだけならば、きっと忘れてしまいます!
- さぁ、Capsロック(Shift-Lock)キーが押されていないことを確認した後、画面に
- レッスン1.1 が全部表示されるところまで、j キーを押してカーソルを移動しま
- しょう。
+ さぁ、Capsロックキーが押されていないことを確認した後、画面にレッスン1.1
+ が全部表示されるところまで、j キーを押してカーソルを移動しましょう。
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
レッスン 1.1: カーソルの移動
@@ -155,7 +154,7 @@
4. 変更をファイルに保存します: :wq <ENTER>
- 5. ステップ 1 で vimtutuor を終了した場合は vimtutor を再度起動し、以下の
+ 5. ステップ 1 で vimtutor を終了した場合は vimtutor を再度起動し、以下の
要約へ進みましょう。
6. 以上のステップを読んで理解した上でこれを実行しましょう。