Merge branch 'master' into option-fixes

2 files changed, 95 insertions, 1 deletions

diff --git a/runtime/keymap/pinyin.vim b/runtime/keymap/pinyin.vim
index 757850b83f..253814c753 100644
--- a/runtime/keymap/pinyin.vim
+++ b/runtime/keymap/pinyin.vim
@@ -1,5 +1,5 @@
 " Vim Keymap file for Hanyu Pinyin tone marks through numbers.
-" Maintainer: Fredrik Roubert <roubert@df.lth.se>
+" Maintainer: Fredrik Roubert <fredrik@roubert.name>
 " Last Changed: February 15, 2004
 
 " All characters are given literally.
diff --git a/runtime/keymap/russian-jcukenmac.vim b/runtime/keymap/russian-jcukenmac.vim
new file mode 100644
index 0000000000..e2120ca1d4
--- /dev/null
+++ b/runtime/keymap/russian-jcukenmac.vim
@@ -0,0 +1,94 @@
+" Vim Keymap file for russian characters, layout 'jcuken', Mac variant
+
+" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Maintainer:   Anton Fonarev <avfonarev@gmail.com>
+" Last Changed: 2016 August 17
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+
+scriptencoding utf-8
+
+let b:keymap_name = "ru"
+
+loadkeymap
+
+\|  Ё   CYRILLIC CAPITAL LETTER IO
+\\  ё   CYRILLIC SMALL LETTER IO
+
+F   А   CYRILLIC CAPITAL LETTER A
+<   Б   CYRILLIC CAPITAL LETTER BE
+D   В   CYRILLIC CAPITAL LETTER VE
+U   Г   CYRILLIC CAPITAL LETTER GHE
+L   Д   CYRILLIC CAPITAL LETTER DE
+T   Е   CYRILLIC CAPITAL LETTER IE
+:   Ж   CYRILLIC CAPITAL LETTER ZHE
+P   З   CYRILLIC CAPITAL LETTER ZE
+B   И   CYRILLIC CAPITAL LETTER I
+Q   Й   CYRILLIC CAPITAL LETTER SHORT I
+R   К   CYRILLIC CAPITAL LETTER KA
+K   Л   CYRILLIC CAPITAL LETTER EL
+V   М   CYRILLIC CAPITAL LETTER EM
+Y   Н   CYRILLIC CAPITAL LETTER EN
+J   О   CYRILLIC CAPITAL LETTER O
+G   П   CYRILLIC CAPITAL LETTER PE
+H   Р   CYRILLIC CAPITAL LETTER ER
+C   С   CYRILLIC CAPITAL LETTER ES
+N   Т   CYRILLIC CAPITAL LETTER TE
+E   У   CYRILLIC CAPITAL LETTER U
+A   Ф   CYRILLIC CAPITAL LETTER EF
+{   Х   CYRILLIC CAPITAL LETTER HA
+W   Ц   CYRILLIC CAPITAL LETTER TSE
+X   Ч   CYRILLIC CAPITAL LETTER CHE
+I   Ш   CYRILLIC CAPITAL LETTER SHA
+O   Щ   CYRILLIC CAPITAL LETTER SHCHA
+}   Ъ   CYRILLIC CAPITAL LETTER HARD SIGN
+S   Ы   CYRILLIC CAPITAL LETTER YERU
+M   Ь   CYRILLIC CAPITAL LETTER SOFT SIGN
+\"  Э   CYRILLIC CAPITAL LETTER E
+>   Ю   CYRILLIC CAPITAL LETTER YU
+Z   Я   CYRILLIC CAPITAL LETTER YA
+f   а   CYRILLIC SMALL LETTER A
+,   б   CYRILLIC SMALL LETTER BE
+d   в   CYRILLIC SMALL LETTER VE
+u   г   CYRILLIC SMALL LETTER GHE
+l   д   CYRILLIC SMALL LETTER DE
+t   е   CYRILLIC SMALL LETTER IE
+;   ж   CYRILLIC SMALL LETTER ZHE
+p   з   CYRILLIC SMALL LETTER ZE
+b   и   CYRILLIC SMALL LETTER I
+q   й   CYRILLIC SMALL LETTER SHORT I
+r   к   CYRILLIC SMALL LETTER KA
+k   л   CYRILLIC SMALL LETTER EL
+v   м   CYRILLIC SMALL LETTER EM
+y   н   CYRILLIC SMALL LETTER EN
+j   о   CYRILLIC SMALL LETTER O
+g   п   CYRILLIC SMALL LETTER PE
+h   р   CYRILLIC SMALL LETTER ER
+c   с   CYRILLIC SMALL LETTER ES
+n   т   CYRILLIC SMALL LETTER TE
+e   у   CYRILLIC SMALL LETTER U
+a   ф   CYRILLIC SMALL LETTER EF
+[   х   CYRILLIC SMALL LETTER HA
+w   ц   CYRILLIC SMALL LETTER TSE
+x   ч   CYRILLIC SMALL LETTER CHE
+i   ш   CYRILLIC SMALL LETTER SHA
+o   щ   CYRILLIC SMALL LETTER SHCHA
+]   ъ   CYRILLIC SMALL LETTER HARD SIGN
+s   ы   CYRILLIC SMALL LETTER YERU
+m   ь   CYRILLIC SMALL LETTER SOFT SIGN
+'   э   CYRILLIC SMALL LETTER E
+.   ю   CYRILLIC SMALL LETTER YU
+z   я   CYRILLIC SMALL LETTER YA
+
+§   >
+±   <
+@   "
+#   №
+$   %
+%   :
+^   ,
+&   .
+*   ;
+`   ]
+~   [