Skip to content

Update {cmdline,helphelp,syntax,usr_05,usr_52}.{txt,jax} #2331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2025
Merged

Update {cmdline,helphelp,syntax,usr_05,usr_52}.{txt,jax} #2331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions doc/cmdline.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*cmdline.txt* For Vim バージョン 9.1. Last change: 2025 Sep 15
*cmdline.txt* For Vim バージョン 9.1. Last change: 2025 Sep 24


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down Expand Up @@ -1095,7 +1095,7 @@ Note: これらは文字通りに打ち込まれる、これらは特別なキ
:S シェルコマンドで利用できるように特別な文字をエスケープする。
(|shellescape()|を参照)。最後でなければならない。例: >
:!dir <cfile>:S
:call system('chmod +w -- ' . expand('%:S'))
:call system('chmod +w -- ' .. expand('%:S'))

ファイル名が "src/version.c"、カレントディレクトリが "/home/mool/vim" のときの
例: >
Expand Down Expand Up @@ -1358,12 +1358,14 @@ Note: これは |file-pattern| なので、"?" をエスケープする必要が

set findfunc=Find
func Find(arg, _)
if get(s:, 'filescache', []) == []
let s:filescache = systemlist(
\ 'find . -path "*/.git" -prune -o -type f -print')
if empty(s:filescache)
let s:filescache = globpath('.', '**', 1, 1)
call filter(s:filescache, '!isdirectory(v:val)')
call map(s:filescache, "fnamemodify(v:val, ':.')")
endif
return a:arg == '' ? s:filescache : matchfuzzy(s:filescache, a:arg)
endfunc
let s:filescache = []
autocmd CmdlineEnter : let s:filescache = []

`:Grep` コマンドは、パターンにマッチする行を検索し、入力すると結果を動的に更新
Expand All @@ -1374,8 +1376,8 @@ Note: これは |file-pattern| なので、"?" をエスケープする必要が
\ Grep call <SID>VisitFile()

func s:Grep(arglead, cmdline, cursorpos)
let cmd = $'grep -REIHns "{a:arglead}" --exclude-dir=.git
\ --exclude=".*"'
if match(&grepprg, '\$\*') == -1 | let &grepprg ..= ' $*' | endif
let cmd = substitute(&grepprg, '\$\*', shellescape(escape(a:arglead, '\')), '')
return len(a:arglead) > 1 ? systemlist(cmd) : []
endfunc

Expand Down
7 changes: 5 additions & 2 deletions doc/helphelp.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*helphelp.txt* For Vim バージョン 9.1. Last change: 2025 Sep 15
*helphelp.txt* For Vim バージョン 9.1. Last change: 2025 Sep 27


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down Expand Up @@ -455,20 +455,23 @@ Ex コマンドのブロックを例示するときは、大なり記号 (>) を
末に書き、小なり記号 (<) をその後ろのブロックの前の最初の非空白文字として書き
ます。テキストが 1 列目から始まっている行があると、Ex コマンドのブロックはその
直前で暗黙的に終了となります。例: >

function Example_Func()
echo "Example"
endfunction
<
コードブロックの構文ハイライトを有効にするには、大なり記号 (>) の後に言語名の
注釈 (例: "vim") を配置します。例: >vim

function Example_Func()
echo "Example"
endfunction
<
*g:help_example_languages*
デフォルトでは、ヘルプファイルは Vim script のハイライトのみをサポートします。
他の言語の構文ハイライトが必要な場合は、|vimrc| に以下を追加してください: >
:let g:help_example_languages = { "vim": "vim", "sh": "bash" }
:let g:help_example_languages = {
\ "vim": "vim", "vim9": "vim", "bash": "sh" }
キーは注釈マーカー名を表し、値は 'syntax' 名です。

Note: "g:help_example_languages" に "vim" を含めない場合、"vim" の構文ハイライ
Expand Down
5 changes: 2 additions & 3 deletions doc/syntax.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*syntax.txt* For Vim バージョン 9.1. Last change: 2025 Sep 16
*syntax.txt* For Vim バージョン 9.1. Last change: 2025 Sep 28


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down Expand Up @@ -2212,12 +2212,11 @@ Java プラットフォームへの重要な変更は、リリース用に実装
に対応するため Vim には実装されている構文関連のプレビュー機能に対するオプショ
ンのサポートがある。以下のようにプレビュー機能番号のリストを指定して、これをリ
クエストできる: >
:let g:java_syntax_previews = [488, 494]
:let g:java_syntax_previews = [488]

サポートされている JEP 番号は以下の表から取得される:
`430`: String Templates [JDK 21]
`488`: Primitive types in Patterns, instanceof, and switch
`494`: Module Import Declarations

Note 特定のプレビュー機能が Java プラットフォームに統合されると、すぐにそのエ
ントリはテーブルから削除され、関連するオプション機能は廃止されることに注意。
Expand Down
3 changes: 2 additions & 1 deletion doc/usr_05.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*usr_05.txt* For Vim バージョン 9.1. Last change: 2025 Apr 10
*usr_05.txt* For Vim バージョン 9.1. Last change: 2025 Sep 27

VIM USER MANUAL - by Bram Moolenaar

Expand Down Expand Up @@ -315,6 +315,7 @@ CTRL-U でアンドゥすることができます。":iunmap <C-U>" で元に戻


*restore-cursor* *last-position-jump* >vim

augroup RestoreCursor
autocmd!
autocmd BufReadPost *
Expand Down
4 changes: 2 additions & 2 deletions doc/usr_52.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*usr_52.txt* For Vim バージョン 9.1. Last change: 2025 Mar 17
*usr_52.txt* For Vim バージョン 9.1. Last change: 2025 Sep 27

VIM USER MANUAL - by Bram Moolenaar

Expand Down Expand Up @@ -352,7 +352,7 @@ $VIMRUNTIME/pack/dist/opt/comment/ にあるパッケージを確認してくだ
☆highlight-yank プラグイン

Vim には、Vim9 script で記述された highlight-yank プラグインが付属しています。
|hlyank-install|。以下は簡略化された実装です: >vim
|hlyank-install|。以下は簡略化された実装です: >vim9

vim9script

Expand Down
16 changes: 9 additions & 7 deletions en/cmdline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*cmdline.txt* For Vim version 9.1. Last change: 2025 Sep 15
*cmdline.txt* For Vim version 9.1. Last change: 2025 Sep 24


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -1161,7 +1161,7 @@ These modifiers can be given, in this order:
:S Escape special characters for use with a shell command (see
|shellescape()|). Must be the last one. Examples: >
:!dir <cfile>:S
:call system('chmod +w -- ' . expand('%:S'))
:call system('chmod +w -- ' .. expand('%:S'))

Examples, when the file name is "src/version.c", current dir
"/home/mool/vim": >
Expand Down Expand Up @@ -1425,12 +1425,14 @@ file picker: >

set findfunc=Find
func Find(arg, _)
if get(s:, 'filescache', []) == []
let s:filescache = systemlist(
\ 'find . -path "*/.git" -prune -o -type f -print')
if empty(s:filescache)
let s:filescache = globpath('.', '**', 1, 1)
call filter(s:filescache, '!isdirectory(v:val)')
call map(s:filescache, "fnamemodify(v:val, ':.')")
endif
return a:arg == '' ? s:filescache : matchfuzzy(s:filescache, a:arg)
endfunc
let s:filescache = []
autocmd CmdlineEnter : let s:filescache = []

The `:Grep` command searches for lines matching a pattern and updates the
Expand All @@ -1441,8 +1443,8 @@ the `CmdlineLeavePre` autocmd from the next section): >
\ Grep call <SID>VisitFile()

func s:Grep(arglead, cmdline, cursorpos)
let cmd = $'grep -REIHns "{a:arglead}" --exclude-dir=.git
\ --exclude=".*"'
if match(&grepprg, '\$\*') == -1 | let &grepprg ..= ' $*' | endif
let cmd = substitute(&grepprg, '\$\*', shellescape(escape(a:arglead, '\')), '')
return len(a:arglead) > 1 ? systemlist(cmd) : []
endfunc

Expand Down
7 changes: 5 additions & 2 deletions en/helphelp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*helphelp.txt* For Vim version 9.1. Last change: 2025 Sep 15
*helphelp.txt* For Vim version 9.1. Last change: 2025 Sep 27


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -463,20 +463,23 @@ To quote a block of ex-commands verbatim, place a greater than (>) character
at the end of the line before the block and a less than (<) character as the
first non-blank on a line following the block. Any line starting in column 1
also implicitly stops the block of ex-commands before it. E.g. >

function Example_Func()
echo "Example"
endfunction
<
To enable syntax highlighting for a block of code, place a language name
annotation (e.g. "vim") after a greater than (>) character. E.g. >vim

function Example_Func()
echo "Example"
endfunction
<
*g:help_example_languages*
By default, help files only support Vim script highlighting. If you need
syntax highlighting for other languages, add to your |vimrc|: >
:let g:help_example_languages = { "vim": "vim", "sh": "bash" }
:let g:help_example_languages = {
\ "vim": "vim", "vim9": "vim", "bash": "sh" }
The key represents the annotation marker name, and the value is the 'syntax'
name.

Expand Down
5 changes: 2 additions & 3 deletions en/syntax.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*syntax.txt* For Vim version 9.1. Last change: 2025 Sep 16
*syntax.txt* For Vim version 9.1. Last change: 2025 Sep 28


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -2272,12 +2272,11 @@ cycles for such a feature to become either integrated into the platform or
withdrawn from this effort. To cater for early adopters, there is optional
support in Vim for syntax related preview features that are implemented. You
can request it by specifying a list of preview feature numbers as follows: >
:let g:java_syntax_previews = [488, 494]
:let g:java_syntax_previews = [488]

The supported JEP numbers are to be drawn from this table:
`430`: String Templates [JDK 21]
`488`: Primitive types in Patterns, instanceof, and switch
`494`: Module Import Declarations

Note that as soon as the particular preview feature will have been integrated
into the Java platform, its entry will be removed from the table and related
Expand Down
3 changes: 2 additions & 1 deletion en/usr_05.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*usr_05.txt* For Vim version 9.1. Last change: 2025 Apr 10
*usr_05.txt* For Vim version 9.1. Last change: 2025 Sep 27

VIM USER MANUAL - by Bram Moolenaar

Expand Down Expand Up @@ -308,6 +308,7 @@ This switches on three very clever mechanisms:


*restore-cursor* *last-position-jump* >vim

augroup RestoreCursor
autocmd!
autocmd BufReadPost *
Expand Down
4 changes: 2 additions & 2 deletions en/usr_52.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*usr_52.txt* For Vim version 9.1. Last change: 2025 Mar 17
*usr_52.txt* For Vim version 9.1. Last change: 2025 Sep 27

VIM USER MANUAL - by Bram Moolenaar

Expand Down Expand Up @@ -347,7 +347,7 @@ Have a look at the package located at $VIMRUNTIME/pack/dist/opt/comment/
HIGHLIGHT YANK PLUGIN

Vim comes with the highlight-yank plugin, written in Vim9 script
|hlyank-install|, here is a simplified implementation: >vim
|hlyank-install|, here is a simplified implementation: >vim9

vim9script

Expand Down