diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 3c8a61ab3a..073a5e049a 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -146,10 +146,10 @@ LANGUAGE SUPPORT |mbyte.txt| Multibyte text support |mlang.txt| Non-English language support |rileft.txt| Right-to-left editing mode -|arabic.txt| Arabic language support and editing -|hebrew.txt| Hebrew language support and editing -|russian.txt| Russian language support and editing -|vietnamese.txt| Vietnamese language support and editing +|l10n-arabic.txt| Arabic language support and editing +|l10n-hebrew.txt| Hebrew language support and editing +|l10n-russian.txt| Russian language support and editing +|l10n-vietnamese.txt| Vietnamese language support and editing ------------------------------------------------------------------------------ INTEROP diff --git a/runtime/doc/arabic.txt b/runtime/doc/l10n-arabic.txt similarity index 99% rename from runtime/doc/arabic.txt rename to runtime/doc/l10n-arabic.txt index 2f603116cd..95e29775da 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/l10n-arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* Nvim +*l10n-arabic.txt* Nvim VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/hebrew.txt b/runtime/doc/l10n-hebrew.txt similarity index 99% rename from runtime/doc/hebrew.txt rename to runtime/doc/l10n-hebrew.txt index c19b4b9835..47cbffc817 100644 --- a/runtime/doc/hebrew.txt +++ b/runtime/doc/l10n-hebrew.txt @@ -1,4 +1,4 @@ -*hebrew.txt* Nvim +*l10n-hebrew.txt* Nvim VIM REFERENCE MANUAL by Ron Aaron (and Avner Lottem) diff --git a/runtime/doc/russian.txt b/runtime/doc/l10n-russian.txt similarity index 98% rename from runtime/doc/russian.txt rename to runtime/doc/l10n-russian.txt index 1a6335dcdb..1803de53fd 100644 --- a/runtime/doc/russian.txt +++ b/runtime/doc/l10n-russian.txt @@ -1,4 +1,4 @@ -*russian.txt* Nvim +*l10n-russian.txt* Nvim VIM REFERENCE MANUAL by Vassily Ragosin diff --git a/runtime/doc/vietnamese.txt b/runtime/doc/l10n-vietnamese.txt similarity index 99% rename from runtime/doc/vietnamese.txt rename to runtime/doc/l10n-vietnamese.txt index 9b76c70e1c..964e11905d 100644 --- a/runtime/doc/vietnamese.txt +++ b/runtime/doc/l10n-vietnamese.txt @@ -1,4 +1,4 @@ -*vietnamese.txt* Nvim +*l10n-vietnamese.txt* Nvim VIM REFERENCE MANUAL by Phạm Bình An diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 31c264182f..258398ed90 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -713,7 +713,7 @@ A jump table for the options with a short description can be found at |Q_op|. - Disable the use of 'keymap' (without changing its value). Note that 'arabicshape' and 'delcombine' are not reset (it is a global option). - Also see |arabic.txt|. + Also see |l10n-arabic.txt|. *'arabicshape'* *'arshape'* *'noarabicshape'* *'noarshape'* 'arabicshape' 'arshape' boolean (default on) @@ -729,7 +729,7 @@ A jump table for the options with a short description can be found at |Q_op|. When disabled the display shows each character's true stand-alone form. Arabic is a complex language which requires other settings, for - further details see |arabic.txt|. + further details see |l10n-arabic.txt|. *'autochdir'* *'acd'* *'noautochdir'* *'noacd'* 'autochdir' 'acd' boolean (default off) @@ -6805,7 +6805,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'arabic' is set and the value of 'arabicshape' will be ignored. Note that setting 'termbidi' has the immediate effect that 'arabicshape' is ignored, but 'rightleft' isn't changed automatically. - For further details see |arabic.txt|. + For further details see |l10n-arabic.txt|. *'termguicolors'* *'tgc'* *'notermguicolors'* *'notgc'* 'termguicolors' 'tgc' boolean (default off) diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index eb89673b5a..f60603ac0b 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -60,7 +60,7 @@ o No special terminal with right-to-left capabilities is required. The o Many languages use and require right-to-left support. These languages can quite easily be supported given the inclusion of their required keyboard mappings and some possible minor code change. Some of the - current supported languages include - |arabic.txt| and |hebrew.txt|. + current supported languages include - |l10n-arabic.txt| and |l10n-hebrew.txt|. ------------------------------------------------------------------------------ diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index f99c3113b9..b541a22c7e 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -71,7 +71,7 @@ vim.go.ambw = vim.go.ambiwidth --- - Disable the use of 'keymap' (without changing its value). --- Note that 'arabicshape' and 'delcombine' are not reset (it is a global --- option). ---- Also see `arabic.txt`. +--- Also see `l10n-arabic.txt`. --- --- @type boolean vim.o.arabic = false @@ -90,7 +90,7 @@ vim.wo.arab = vim.wo.arabic --- When disabled the display shows each character's true stand-alone --- form. --- Arabic is a complex language which requires other settings, for ---- further details see `arabic.txt`. +--- further details see `l10n-arabic.txt`. --- --- @type boolean vim.o.arabicshape = true @@ -7357,7 +7357,7 @@ vim.go.tgst = vim.go.tagstack --- 'arabic' is set and the value of 'arabicshape' will be ignored. --- Note that setting 'termbidi' has the immediate effect that --- 'arabicshape' is ignored, but 'rightleft' isn't changed automatically. ---- For further details see `arabic.txt`. +--- For further details see `l10n-arabic.txt`. --- --- @type boolean vim.o.termbidi = false diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 3f9aa538c7..dddbbf4bf5 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -314,6 +314,10 @@ preprocess_patch() { LC_ALL=C sed -Ee 's/( [ab]\/runtime\/doc)\/eval\.txt/\1\/vimeval.txt/g' \ "$file" > "$file".tmp && mv "$file".tmp "$file" + # Rename .txt to l10n-.txt + LC_ALL=C sed -Ee 's/( [ab]\/runtime\/doc)\/(arabic|hebrew|russian|vietnamese)\.txt/\1\/l10n-\2.txt/g' \ + "$file" > "$file".tmp && mv "$file".tmp "$file" + # Rename version*.txt to news.txt LC_ALL=C sed -Ee 's/( [ab]\/runtime\/doc)\/version[0-9]+\.txt/\1\/news.txt/g' \ "$file" > "$file".tmp && mv "$file".tmp "$file" diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 942bb4aeff..58975ff992 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -178,7 +178,7 @@ local options = { - Disable the use of 'keymap' (without changing its value). Note that 'arabicshape' and 'delcombine' are not reset (it is a global option). - Also see |arabic.txt|. + Also see |l10n-arabic.txt|. ]=], full_name = 'arabic', redraw = { 'curswant' }, @@ -201,7 +201,7 @@ local options = { When disabled the display shows each character's true stand-alone form. Arabic is a complex language which requires other settings, for - further details see |arabic.txt|. + further details see |l10n-arabic.txt|. ]=], full_name = 'arabicshape', redraw = { 'all_windows', 'ui_option' }, @@ -9499,7 +9499,7 @@ local options = { 'arabic' is set and the value of 'arabicshape' will be ignored. Note that setting 'termbidi' has the immediate effect that 'arabicshape' is ignored, but 'rightleft' isn't changed automatically. - For further details see |arabic.txt|. + For further details see |l10n-arabic.txt|. ]=], full_name = 'termbidi', scope = { 'global' },