aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/intro.txt2
-rw-r--r--runtime/doc/sign.txt4
-rw-r--r--runtime/nvim.desktop6
-rw-r--r--runtime/syntax/vim.vim5
4 files changed, 9 insertions, 8 deletions
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index d858985e3f..69118db4fe 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -143,7 +143,7 @@ Vim would never have become what it is now, without the help of these people!
Sung-Hyun Nam Work on multi-byte versions
Vince Negri Win32 GUI and generic console enhancements
Steve Oualline Author of the first Vim book |frombook|
- Dominique Pelle valgrind reports and many fixes
+ Dominique Pelle Valgrind reports and many fixes
A.Politz Many bug reports and some fixes
George V. Reilly Win32 port, Win32 GUI start-off
Stephen Riehm bug collector
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 896698aaa6..1f9de19fc7 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -42,8 +42,8 @@ When signs are defined for a file, Vim will automatically add a column of two
characters to display them in. When the last sign is unplaced the column
disappears again. This behavior can be changed with the 'signcolumn' option.
-The color of the column is set with the SignColumn group |hl-SignColumn|.
-Example to set the color: >
+The color of the column is set with the SignColumn highlight group
+|hl-SignColumn|. Example to set the color: >
:highlight SignColumn guibg=darkgrey
<
diff --git a/runtime/nvim.desktop b/runtime/nvim.desktop
index 21bde61314..71aca5e157 100644
--- a/runtime/nvim.desktop
+++ b/runtime/nvim.desktop
@@ -2,6 +2,7 @@
Name=Neovim
GenericName=Text Editor
GenericName[de]=Texteditor
+GenericName[ru]=Текстовый редактор
GenericName[sr]=Едитор текста
GenericName[tr]=Metin Düzenleyici
Comment=Edit text files
@@ -56,7 +57,7 @@ Comment[pl]=Edytor plików tekstowych
Comment[pt]=Editar ficheiros de texto
Comment[pt_BR]=Edite arquivos de texto
Comment[ro]=Editare fişiere text
-Comment[ru]=Редактор текстовых файлов
+Comment[ru]=Редактирование текстовых файлов
Comment[sk]=Úprava textových súborov
Comment[sl]=Urejanje datotek z besedili
Comment[sq]=Përpuno files teksti
@@ -66,7 +67,7 @@ Comment[sv]=Redigera textfiler
Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
Comment[th]=แก้ไขแฟ้มข้อความ
Comment[tk]=Metin faýllary editle
-Comment[tr]=Metin dosyaları düzenle
+Comment[tr]=Metin dosyaları düzenleyin
Comment[uk]=Редактор текстових файлів
Comment[vi]=Soạn thảo tập tin văn bản
Comment[wa]=Asspougnî des fitchîs tecses
@@ -77,6 +78,7 @@ Exec=nvim %F
Terminal=true
Type=Application
Keywords=Text;editor;
+Keywords[ru]=текст;текстовый редактор
Keywords[tr]=Metin;düzenleyici;
Icon=nvim
Categories=Utility;TextEditor;
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 5b1d61bd26..07e9077d4f 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -210,7 +210,7 @@ endif
" Functions : Tag is provided for those who wish to highlight tagged functions {{{2
" =========
syn cluster vimFuncList contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimFuncSID
-syn cluster vimFuncBodyList contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
+syn cluster vimFuncBodyList contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLetHereDoc,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
syn match vimFunction "\<fu\%[nction]!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*(" contains=@vimFuncList nextgroup=vimFuncBody
if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
@@ -352,8 +352,7 @@ syn match vimSetMod contained "&vim\=\|[!&?<]\|all&"
" Let: {{{2
" ===
syn keyword vimLet let unl[et] skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
-VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z([^a-z]\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$' contains=vimComment
-syn cluster vimFuncBodyList add=vimLetHereDoc
+VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$' contains=vimComment
" Abbreviations: {{{2
" =============