Merge pull request #1127 from tsuyoshicho/update/20220813/misc

h-east · web-flow · commit 238b7f54cb7f · 2022-08-18T19:35:10.000+09:00
Update misc files
diff --git a/doc/autocmd.jax b/doc/autocmd.jax
@@ -1258,8 +1258,7 @@ User				自動的に実行されることはない。コマンド
 				    if exists('#User#MyEvent')
 					doautocmd User MyEvent
 				    endif
-
-
+<
 							*SigUSR1*
 SigUSR1				SIGUSR1シグナルを受けとった後。Vimに通知する他
 				の方法では実現できない場合に使われる。例えば、
diff --git a/doc/change.jax b/doc/change.jax
@@ -774,8 +774,11 @@ NOTE パターンに 'magic' が適用されるかどうかを変更するフラ
 					*sub-replace-special* *:s\=*
 {string} が "\=" で始まるときは、それは式として評価される。
 |sub-replace-expression| を参照のこと。複雑な置換や特殊な文字を使うことができ
-る。そうでなければ、{string} の中のこれらの文字は特別な意味を持つ:
+る。
+
+置換は再帰内で4段階までに制限されている。 *E1290*
 
+そうでなければ、{string} の中のこれらの文字は特別な意味を持つ:
 								*:s%*
 'cpoptions' に '/' が含まれている場合、{string} が "%" に等しいならば前の置換
 コマンドの {string} が使われる。|cpo-/| 参照
diff --git a/doc/help.jax b/doc/help.jax
@@ -18,15 +18,17 @@
 		    類を指定することもできます:  *help-context*
 
 			  種類			修飾子	    例	~
-		  ノーマルモードコマンド		   :help x
-		  ビジュアルモードコマンド	 v_	   :help v_u
-		  挿入モードコマンド		 i_	   :help i_<Esc>
-		  コマンドラインコマンド	 :	   :help :quit
-		  コマンドライン編集		 c_	   :help c_<Del>
-		  Vim の起動引数		 -	   :help -r
-		  オプション			 '	   :help 'textwidth'
-		  正規表現			 /	   :help /[
+		      ノーマルモードコマンド		   :help x
+		      ビジュアルモードコマンド	  v_	   :help v_u
+		      挿入モードコマンド	  i_	   :help i_<Esc>
+		      コマンドラインコマンド	  :	   :help :quit
+		      コマンドライン編集	  c_	   :help c_<Del>
+		      Vim の起動引数		  -	   :help -r
+		      オプション		  '	   :help 'textwidth'
+		      正規表現			  /	   :help /[
 		    その他の種類については |help-summary| を参照してください。
+		    ヘルプの構文の説明は |notation| を参照してください。
+
 
   ヘルプを検索する: ":help word" とタイプしてから CTRL-D を押すと "word" に
 		    マッチするヘルプ項目の一覧が表示されます。
diff --git a/doc/pattern.jax b/doc/pattern.jax
@@ -917,7 +917,7 @@ $	パターンの末尾、または "\|"、"\)"、"\n" ('magic' on時) の前に
 	ります。Vim は自動的にマッチの強調表示を更新したりしません。
 	|/\%#| で検索した後にカーソルを動かした場合と似ています。
 
-					*/\%l* */\%>l* */\%<l* *E951* *E1204*
+				*/\%l* */\%>l* */\%<l* *E951* *E1204* *E1273*
 \%23l	指定した行にマッチします。
 \%<23l	指定した行より上にマッチします。
 \%>23l	指定した行より下にマッチします。
diff --git a/doc/popup.jax b/doc/popup.jax
@@ -596,7 +596,7 @@ POPUP_CREATE() の引数				 *popup_create-arguments*
 
 |popup_create()| の最初の引数(と |popup_settext()| の第2引数)は表示されるテキ
 ストと、オプションでテキストプロパティを指定する。それは4つの形式のうちの1つで
-ある:
+ある:  *E1284*
 - バッファ番号
 - 文字列
 - 文字列のリスト
diff --git a/doc/repeat.jax b/doc/repeat.jax
@@ -224,7 +224,7 @@ Vim script の書き方はユーザーマニュアルの41章|usr_41.txt|を参
 			例: >
 				:4,5source
 				:10,18source ++clear
-
+<
 							*:source!*
 :so[urce]! {file}	Vimコマンドを{file}から読み込む。ノーマルモードでファ
 			イルの内容をあなたがタイプしたのと同じように実行される。
diff --git a/doc/spell.jax b/doc/spell.jax
@@ -103,7 +103,7 @@ zuW							*zuG* *zuW*
 zuG			|zW| や |zG| をundoして、内部単語リストからその単語を
 			削除する。count は |zg| と同様に使われる。
 
-							*:spe* *:spellgood*
+						*:spe* *:spellgood* *E1280*
 :[count]spe[llgood] {word}
 			|zg| と同様に、{word} を正しい単語として 'spellfile' に
 			加える。count が無いときは最初の名前が使われ、count に
diff --git a/doc/version8.jax b/doc/version8.jax
@@ -18433,7 +18433,7 @@ Problem:    When 'wrapscan' is off "gn" does not select the whole pattern when
 Solution:   Check if the search fails. (Christian Brabandt, closes #1683)
 Files:      src/search.c, src/testdir/test_gn.vim
 
-Patch 8.0.0628 (after 8.0.0626
+Patch 8.0.0628 (after 8.0.0626)
 Problem:    Cursor disappears after silent mapping. (Ramel Eshed)
 Solution:   Do restore the cursor when it was changed, but don't change it in
             the first place for a silent mapping.
diff --git a/en/autocmd.txt b/en/autocmd.txt
@@ -1275,7 +1275,7 @@ User				Never executed automatically.  To be used for
 				    if exists('#User#MyEvent')
 					doautocmd User MyEvent
 				    endif
-
+<
 							*SigUSR1*
 SigUSR1				After the SIGUSR1 signal has been detected.
 				Could be used if other ways of notifying Vim
diff --git a/en/change.txt b/en/change.txt
@@ -802,6 +802,8 @@ When the {string} starts with "\=" it is evaluated as an expression, see
 |sub-replace-expression|.  You can use that for complex replacement or special
 characters.
 
+The substitution is limited in recursion to 4 levels. *E1290*
+
 Otherwise these characters in {string} have a special meaning:
 								*:s%*
 When {string} is equal to "%" and '/' is included with the 'cpoptions' option,
diff --git a/en/gui_x11.txt b/en/gui_x11.txt
@@ -680,7 +680,7 @@ Of these three, Vim uses PRIMARY when reading and writing the "* register
 register.  Vim does not access the SECONDARY selection.
 
 This applies both to the GUI and the terminal version.  For non-X11 systems
-the plus and the star register both us the system clipboard.
+the plus and the star register both use the system clipboard.
 
 Examples: (assuming the default option values)
 - Select a URL in Visual mode in Vim.  Go to your browser and click the
diff --git a/en/help.txt b/en/help.txt
@@ -26,6 +26,7 @@ Get specific help:  It is possible to go directly to whatever you want help
 		      Option			  '	   :help 'textwidth'
 		      Regular expression	  /	   :help /[
 		    See |help-summary| for more contexts and an explanation.
+		    See |notation| for an explanation of the help syntax.
 
   Search for help:  Type ":help word", then hit CTRL-D to see matching
 		    help entries for "word".
diff --git a/en/if_pyth.txt b/en/if_pyth.txt
@@ -839,10 +839,10 @@ Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
 	:py vim.command("qall!")
 <
 							*E1266*
-This error can occur when python 3 cannot load the required modules.  This
-means that your python 3 is not correctly installed or there are some mistakes
+This error can occur when Python 3 cannot load the required modules.  This
+means that your Python 3 is not correctly installed or there are some mistakes
 in your settings.  Please check the following items:
-1. Make sure that python 3 is correctly installed.  Also check the version of
+1. Make sure that Python 3 is correctly installed.  Also check the version of
    python.
 2. Check the 'pythonthreedll' option.
 3. Check the 'pythonthreehome' option.
@@ -887,8 +887,8 @@ the runtime library cannot be found.
 ==============================================================================
 11. Python X						*python_x* *pythonx*
 
-Because most python code can be written so that it works with python 2.6+ and
-python 3 the pyx* functions and commands have been written.  They work exactly
+Because most python code can be written so that it works with Python 2.6+ and
+Python 3 the pyx* functions and commands have been written.  They work exactly
 the same as the Python 2 and 3 variants, but select the Python version using
 the 'pyxversion' setting.
 
diff --git a/en/pattern.txt b/en/pattern.txt
@@ -928,7 +928,7 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	becomes invalid.  Vim doesn't automatically update the matches.
 	Similar to moving the cursor for "\%#" |/\%#|.
 
-					*/\%l* */\%>l* */\%<l* *E951* *E1204*
+				*/\%l* */\%>l* */\%<l* *E951* *E1204* *E1273*
 \%23l	Matches in a specific line.
 \%<23l	Matches above a specific line (lower line number).
 \%>23l	Matches below a specific line (higher line number).
diff --git a/en/popup.txt b/en/popup.txt
@@ -591,7 +591,7 @@ POPUP_CREATE() ARGUMENTS			 *popup_create-arguments*
 
 The first argument of |popup_create()| (and the second argument to
 |popup_settext()|) specifies the text to be displayed, and optionally text
-properties.  It is in one of four forms:
+properties.  It is in one of four forms:  *E1284*
 - a buffer number
 - a string
 - a list of strings
diff --git a/en/repeat.txt b/en/repeat.txt
@@ -231,7 +231,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			Examples: >
 				:4,5source
 				:10,18source ++clear
-
+<
 							*:source!*
 :so[urce]! {file}	Read Vim commands from {file}.  These are commands
 			that are executed from Normal mode, like you type
diff --git a/en/spell.txt b/en/spell.txt
@@ -103,7 +103,7 @@ zuW							*zuG* *zuW*
 zuG			Undo |zW| and |zG|, remove the word from the internal
 			word list.  Count used as with |zg|.
 
-							*:spe* *:spellgood*
+						*:spe* *:spellgood* *E1280*
 :[count]spe[llgood] {word}
 			Add {word} as a good word to 'spellfile', like with
 			|zg|.  Without count the first name is used, with a
diff --git a/en/version8.txt b/en/version8.txt
@@ -1,4 +1,4 @@
-*version8.txt*  For Vim version 8.2.  Last change: 2022 Feb 26
+*version8.txt*  For Vim version 9.0.  Last change: 2022 Feb 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -370,8 +370,8 @@ New autocommand events: ~
 |OptionSet|		after setting any option
 |TabClosed|		after closing a tab page
 |TabNew|		after creating a new tab page
-|TextChangedI|		after a change was made to the text in Insert mode
 |TextChanged|		after a change was made to the text in Normal mode
+|TextChangedI|		after a change was made to the text in Insert mode
 |WinNew|		after creating a new window
 
 
@@ -18427,7 +18427,7 @@ Problem:    When 'wrapscan' is off "gn" does not select the whole pattern when
 Solution:   Check if the search fails. (Christian Brabandt, closes #1683)
 Files:      src/search.c, src/testdir/test_gn.vim
 
-Patch 8.0.0628 (after 8.0.0626
+Patch 8.0.0628 (after 8.0.0626)
 Problem:    Cursor disappears after silent mapping. (Ramel Eshed)
 Solution:   Do restore the cursor when it was changed, but don't change it in
             the first place for a silent mapping.
