Skip to content

Update {diff,editing,gui_w32,gui_x11},{txt,jax} #2204

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
Aug 6, 2025
Merged

Update {diff,editing,gui_w32,gui_x11},{txt,jax} #2204

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
4 changes: 2 additions & 2 deletions doc/diff.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*diff.txt* For Vim バージョン 9.1. Last change: 2025 Jul 26
*diff.txt* For Vim バージョン 9.1. Last change: 2025 Aug 06


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down Expand Up @@ -469,7 +469,7 @@ Vimは片方のウィンドウには存在しないがもう一方には存在
==============================================================================
6. 差分モードオプション *diff-options*

|'diffopt'| と |'fillchars'| の "diff" 項目も参照。
'diffopt' と 'fillchars' の "diff" 項目も参照。

*diff-slow* *diff_translations*
行がとても長いと diff 構文ハイライトが遅くなるかもしれない。その場合は特にたく
Expand Down
2 changes: 1 addition & 1 deletion doc/editing.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*editing.txt* For Vim バージョン 9.1. Last change: 2025 Jul 20
*editing.txt* For Vim バージョン 9.1. Last change: 2025 Aug 06


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down
4 changes: 2 additions & 2 deletions doc/gui_w32.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*gui_w32.txt* For Vim バージョン 9.1. Last change: 2024 Jan 23
*gui_w32.txt* For Vim バージョン 9.1. Last change: 2025 Aug 06


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down Expand Up @@ -395,7 +395,7 @@ Win32 GUI版ではMotifの「切取メニュー」をエミュレートする。
:w >>prn

Vimでは多くのMS-Windows標準の機能をサポートしている。それらの幾つかは別の場所
で説明されている: |'mouse'|、|win32-hidden-menus|を参照。
で説明されている: 'mouse'、|win32-hidden-menus| を参照。

*drag-n-drop-win32*
Vimのウィンドウに1つもしくは複数のファイルをドラッグ&ドロップすることができ、
Expand Down
10 changes: 5 additions & 5 deletions doc/gui_x11.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*gui_x11.txt* For Vim バージョン 9.1. Last change: 2025 Jul 23
*gui_x11.txt* For Vim バージョン 9.1. Last change: 2025 Aug 06


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down Expand Up @@ -284,7 +284,7 @@ CDE "dtwm" (Motifから派生)については、.Xdefaultsにこの行を追加

X11で利用できるマウスポインタ ~
*X11_mouse_shapes*
|'mouseshape'| オプションを使うと、Vimがモード (挿入モードやコマンドモードなど)
'mouseshape' オプションを使うと、Vimがモード (挿入モードやコマンドモードなど)
を変更するたびに自動的にマウスポインタを変更できる。現在、利用できるポインタは
次の通り:

Expand Down Expand Up @@ -325,8 +325,8 @@ app-defaultsは使われない。
-fg -foreground {color} 前景色
-bg -background {color} 背景色

フォントを設定するには、|'guifont'| を参照。GTKについては、これをするメニュー
オプションもある。
フォントを設定するには、'guifont' を参照。GTKについては、これをするメニューオ
プションもある。

さらに、GTKの内部で扱われるこれらのコマンドライン引数がある。それらがどのよう
に用いられるかはGTKのドキュメントを見るとよい。
Expand Down Expand Up @@ -681,7 +681,7 @@ X サーバーから直接読み込まれる。
ボード (カット、コピー、ペーストに使われる)。

この 3 つの内、Vim は "* レジスタを読み書きするときにはプライマリを使う (X11
セレクションが利用可能なとき、Vim は |'clipboard'| にデフォルトとして
セレクションが利用可能なとき、Vim は 'clipboard' にデフォルトとして
"autoselect" を設定する)。"+ レジスタを読み書きするときにはクリップボードを
使う。Vim はセカンダリを使わない。

Expand Down
4 changes: 2 additions & 2 deletions en/diff.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*diff.txt* For Vim version 9.1. Last change: 2025 Jul 26
*diff.txt* For Vim version 9.1. Last change: 2025 Aug 06


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -461,7 +461,7 @@ Manually set two anchors using line numbers via buffer-local options: >
==============================================================================
6. Diff options *diff-options*

Also see |'diffopt'| and the "diff" item of |'fillchars'|.
Also see 'diffopt' and the "diff" item of 'fillchars'.

*diff-slow* *diff_translations*
For very long lines, the diff syntax highlighting might be slow, especially
Expand Down
4 changes: 2 additions & 2 deletions en/editing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*editing.txt* For Vim version 9.1. Last change: 2025 Jul 20
*editing.txt* For Vim version 9.1. Last change: 2025 Aug 06


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -1380,7 +1380,7 @@ present in 'cpoptions' and "!" is not used in the command.

:cd[!] {path} Change the current directory to {path}.
If {path} is relative, it is searched for in the
directories listed in |'cdpath'|.
directories listed in 'cdpath'.
Clear any window-local directory.
Does not change the meaning of an already opened file,
because its full path name is remembered. Files from
Expand Down
4 changes: 2 additions & 2 deletions en/gui_w32.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*gui_w32.txt* For Vim version 9.1. Last change: 2024 Jan 23
*gui_w32.txt* For Vim version 9.1. Last change: 2025 Aug 06


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -394,7 +394,7 @@ printer installed this should also work: >
:w >>prn

Vim supports a number of standard MS-Windows features. Some of these are
detailed elsewhere: see |'mouse'|, |win32-hidden-menus|.
detailed elsewhere: see 'mouse', |win32-hidden-menus|.

*drag-n-drop-win32*
You can drag and drop one or more files into the Vim window, where they will
Expand Down
13 changes: 6 additions & 7 deletions en/gui_x11.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*gui_x11.txt* For Vim version 9.1. Last change: 2025 Jul 23
*gui_x11.txt* For Vim version 9.1. Last change: 2025 Aug 06


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -280,7 +280,7 @@ For "mwm" (Motif window manager) the line would be: >

Mouse Pointers Available in X11 ~
*X11_mouse_shapes*
By using the |'mouseshape'| option, the mouse pointer can be automatically
By using the 'mouseshape' option, the mouse pointer can be automatically
changed whenever Vim enters one of its various modes (e.g., Insert or
Command). Currently, the available pointers are:

Expand Down Expand Up @@ -321,8 +321,8 @@ stuff like -bg, -fg, etc). The ones that are supported are:
-fg -foreground {color} foreground color
-bg -background {color} background color

To set the font, see |'guifont'|. For GTK, there's also a menu option that
does this.
To set the font, see 'guifont'. For GTK, there's also a menu option that does
this.

Additionally, there are these command line arguments, which are handled by GTK
internally. Look in the GTK documentation for how they are used:
Expand Down Expand Up @@ -649,8 +649,7 @@ X11R5 with a library for X11R6 probably doesn't work (although the linking
won't give an error message, Vim will crash later).

*gui-wayland*
Support for the Wayland display server protocol has landed in patch
9.1.0064.
Support for the Wayland display server protocol has landed in patch 9.1.0064.

Note: The Wayland protocol is subject to some restrictions, so the following
functions won't work: |getwinpos()|, |getwinposx()|, |getwinposy()| and the
Expand Down Expand Up @@ -685,7 +684,7 @@ cut, copy and paste operations).

Of these three, Vim uses PRIMARY when reading and writing the "* register
(hence when the X11 selections are available, Vim sets a default value for
|'clipboard'| of "autoselect"), and CLIPBOARD when reading and writing the "+
'clipboard' of "autoselect"), and CLIPBOARD when reading and writing the "+
register. Vim does not access the SECONDARY selection.

This applies both to the GUI and the terminal version. For non-X11 systems
Expand Down