diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 2b5ed33f06..a7644fab84 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -813,6 +813,7 @@ Short explanation of each option: *option-list* 'printmbcharset' 'pmbcs' CJK character set to be used for :hardcopy 'printmbfont' 'pmbfn' font names to be used for CJK output of :hardcopy 'printoptions' 'popt' controls the format of :hardcopy output +'prompt' 'prompt' enable prompt in Ex mode 'pumheight' 'ph' maximum height of the popup menu 'pythondll' name of the Python 2 dynamic library 'pythonthreedll' name of the Python 3 dynamic library diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index b58b3c7853..d104ca9583 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.4. Last change: 2016 Jun 12 +*starting.txt* For Vim version 7.4. Last change: 2016 Jun 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/keymap/vietnamese-telex_utf-8.vim b/runtime/keymap/vietnamese-telex_utf-8.vim new file mode 100644 index 0000000000..f9fd055d14 --- /dev/null +++ b/runtime/keymap/vietnamese-telex_utf-8.vim @@ -0,0 +1,196 @@ +" Vim Keymap file for Vietnamese through Telex method +" Maintainer: Raphael McSinyx +" Last Change: 2016-06-13 + +scriptencoding utf-8 + +let b:keymap_name = "vi" + +loadkeymap + +A\\ A +AF À +AS Á +AR Ả +AX Ã +AJ Ạ + +AW Ă +AW\\ Ă +AWF Ằ +AWS Ắ +AWR Ẳ +AWX Ẵ +AWJ Ặ + +AA Â +AA\\ Â +AAF Ầ +AAS Ấ +AAR Ẩ +AAX Ẫ +AAJ Ậ + +D\\ D +DD Đ + +E E +E\\ E +EF È +ES É +ER Ẻ +EX Ẽ +EJ Ẹ + +EE Ê +EE\\ Ê +EEF Ề +EES Ế +EER Ể +EEX Ễ +EEJ Ệ + +I\\ I +IF Ì +IS Í +IR Ỉ +IX Ĩ +IJ Ị + +O\\ O +OF Ò +OS Ó +OR Ỏ +OX Õ +OJ Ọ + +OO Ô +OO\\ Ô +OOF Ồ +OOS Ố +OOR Ổ +OOX Ỗ +OOJ Ộ + +OW Ơ +OW\\ Ơ +OWF Ờ +OWS Ớ +OWR Ở +OWX Ỡ +OWJ Ợ + +U\\ U +UF Ù +US Ú +UR Ủ +UX Ũ +UJ Ụ + +UW Ư +UW\\ Ư +UWF Ừ +UWS Ứ +UWR Ử +UWX Ữ +UWJ Ự + +Y\\ Y +YF Ỳ +YS Ý +YR Ỷ +YX Ỹ +YJ Ỵ + +a\\ a +af à +as á +ar ả +ax ã +aj ạ + +aw ă +aw\\ ă +awf ằ +aws ắ +awr ẳ +awx ẵ +awj ặ + +aa â +aa\\ â +aaf ầ +aas ấ +aar ẩ +aax ẫ +aaj ậ + +d\\ d +dd đ + +e\\ e +ef è +es é +er ẻ +ex ẽ +ej ẹ + +ee ê +ee\\ ê +eef ề +ees ế +eer ể +eex ễ +eej ệ + +i\\ i +if ì +is í +ir ỉ +ix ĩ +ij ị + +o\\ o +of ò +os ó +or ỏ +ox õ +oj ọ + +oo ô +oo\\ ô +oof ồ +oos ố +oor ổ +oox ỗ +ooj ộ + +ow ơ +ow\\ ơ +owf ờ +ows ớ +owr ở +owx ỡ +owj ợ + +u\\ u +uf ù +us ú +ur ủ +ux ũ +uj ụ + +uw ư +uw\\ ư +uwf ừ +uws ứ +uwr ử +uwx ữ +uwj ự + +y\\ y +yf ỳ +ys ý +yr ỷ +yx ỹ +yj ỵ diff --git a/runtime/keymap/vietnamese-vni_utf-8.vim b/runtime/keymap/vietnamese-vni_utf-8.vim new file mode 100644 index 0000000000..c9312c6854 --- /dev/null +++ b/runtime/keymap/vietnamese-vni_utf-8.vim @@ -0,0 +1,196 @@ +" Vim Keymap file for Vietnamese through VNI method +" Maintainer: Raphael McSinyx +" Last Change: 2016-06-13 + +scriptencoding utf-8 + +let b:keymap_name = "vi" + +loadkeymap + +A\\ A +A1 Á +A2 À +A3 Ả +A4 Ã +A5 Ạ + +A8 Ă +A8\\ Ă +A81 Ắ +A82 Ằ +A83 Ẳ +A84 Ẵ +A85 Ặ + +A6 Â +A6\\ Â +A61 Ấ +A62 Ầ +A63 Ẩ +A64 Ẫ +A65 Ậ + +D D +D\\ D +D9 Đ + +E\\ E +E1 É +E2 È +E3 Ẻ +E4 Ẽ +E5 Ẹ + +E6 Ê +E6\\ Ê +E61 Ế +E62 Ề +E63 Ể +E64 Ễ +E65 Ệ + +I\\ I +I1 Í +I2 Ì +I3 Ỉ +I4 Ĩ +I5 Ị + +O\\ O +O1 Ó +O2 Ò +O3 Ỏ +O4 Õ +O5 Ọ + +O6 Ô +O6\\ Ô +O61 Ố +O62 Ồ +O63 Ổ +O64 Ỗ +O65 Ộ + +O7 Ơ +O7\\ Ơ +O71 Ớ +O72 Ờ +O73 Ở +O74 Ỡ +O75 Ợ + +U\\ U +U1 Ú +U2 Ù +U3 Ủ +U4 Ũ +U5 Ụ + +U7 Ư +U7\\ Ư +U71 Ứ +U72 Ừ +U73 Ử +U74 Ữ +U75 Ự + +Y\\ Y +Y1 Ý +Y2 Ỳ +Y3 Ỷ +Y4 Ỹ +Y5 Ỵ + +a\\ a +a1 á +a2 à +a3 ả +a4 ã +a5 ạ + +a8 ă +a8\\ ă +a81 ắ +a82 ằ +a83 ẳ +a84 ẵ +a85 ặ + +a6 â +a6\\ â +a61 ấ +a62 ầ +a63 ẩ +a64 ẫ +a65 ậ + +d\\ d +d9 đ + +e\\ e +e1 é +e2 è +e3 ẻ +e4 ẽ +e5 ẹ + +e6 ê +e6\\ ê +e61 ế +e62 ề +e63 ể +e64 ễ +e65 ệ + +i\\ i +i1 í +i2 ì +i3 ỉ +i4 ĩ +i5 ị + +o\\ o +o1 ó +o2 ò +o3 ỏ +o4 õ +o5 ọ + +o6 ô +o6\\ ô +o61 ố +o62 ồ +o63 ổ +o64 ỗ +o65 ộ + +o7 ơ +o7\\ ơ +o71 ớ +o72 ờ +o73 ở +o74 ỡ +o75 ợ + +u\\ u +u1 ú +u2 ù +u3 ủ +u4 ũ +u5 ụ + +u7 ư +u7\\ ư +u71 ứ +u72 ừ +u73 ử +u74 ữ +u75 ự + +y\\ y +y1 ý +y2 ỳ +y3 ỷ +y4 ỹ +y5 ỵ diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim index b3c89f8352..ef07b22676 100644 --- a/runtime/syntax/rst.vim +++ b/runtime/syntax/rst.vim @@ -2,7 +2,7 @@ " Language: reStructuredText documentation format " Maintainer: Marshall Ward " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2016-01-05 +" Latest Revision: 2016-06-17 if exists("b:current_syntax") finish @@ -137,7 +137,7 @@ syn match rstStandaloneHyperlink contains=@NoSpell \ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]" syn region rstCodeBlock contained matchgroup=rstDirective - \ start=+\%(sourcecode\|code\%(-block\)\=\)::\_s*\n\ze\z(\s\+\)+ + \ start=+\%(sourcecode\|code\%(-block\)\=\)::\s\+\w*\_s*\n\ze\z(\s\+\)+ \ skip=+^$+ \ end=+^\z1\@!+ \ contains=@NoSpell @@ -153,10 +153,11 @@ for code in g:rst_syntax_code_list " guard against setting 'isk' option which might cause problems (issue #108) let prior_isk = &l:iskeyword exe 'syn include @rst'.code.' syntax/'.code.'.vim' - exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold ' - \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# ' - \.'skip=#^$# ' - \.'end=#^\z1\@!# contains=@NoSpell,@rst'.code + exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold' + \.' start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)#' + \.' skip=#^$#' + \.' end=#^\z1\@!#' + \.' contains=@NoSpell,@rst'.code exe 'syn cluster rstDirectives add=rstDirective'.code " reset 'isk' setting, if it has been changed if &l:iskeyword !=# prior_isk @@ -185,10 +186,11 @@ hi def link rstHyperlinkTarget String hi def link rstExDirective String hi def link rstSubstitutionDefinition rstDirective hi def link rstDelimiter Delimiter -" TODO: I dunno... -hi def rstEmphasis term=italic cterm=italic gui=italic +hi def link rstEmphasis Underlined hi def link rstStrongEmphasis Special -"term=bold cterm=bold gui=bold +" TODO Append these atttributes somehow +"hi def rstEmphasis term=italic cterm=italic gui=italic +"hi def rstStrongEmphasis term=bold cterm=bold gui=bold hi def link rstInterpretedTextOrHyperlinkReference Identifier hi def link rstInlineLiteral String hi def link rstSubstitutionReference PreProc diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po index 6c62262675..b8b119ade6 100644 --- a/src/nvim/po/it.po +++ b/src/nvim/po/it.po @@ -2541,7 +2541,7 @@ msgstr "E490: Non trovo alcuna piegatura" #: ../fold.c:544 msgid "E350: Cannot create fold with current 'foldmethod'" -msgstr "E350: Non posso create piegatura con il 'foldmethod' in uso" +msgstr "E350: Non posso creare piegatura con il 'foldmethod' in uso" #: ../fold.c:546 msgid "E351: Cannot delete fold with current 'foldmethod'"