updated for version 7.0159v7.0159

6 files changed, 594 insertions, 1204 deletions

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 14097a936..09cc4310c 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Nov 23
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Nov 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -44,12 +44,19 @@ differences.  Use Amiga code?
 
 "make unixall": remove split in floppy-size archives.
 
+Using pipes for filter commands: provide some way to type a password, keep
+stderr in/out open for this?
+
 To support mapping <F4> to be used as <F4>{motion}: Add operator that
 executes a user defined function. '[ and '] marks are at start and end of
 text.  ":map <F4> :set opfunc=MyOp<CR>gy".
 
 Patch from Yasuhiro Matsumoto: ":e ++enc=xxx" keeps encoding for conversion
-errors and illegal bytes.  How about replacing bytes with '?' or not?
+errors and illegal bytes.  Make default to replace bad bytes/characters with
+'?' and allow for two alternatives:
+	:e ++enc=xxx ++bad=keep foo.txt
+	:e ++enc=xxx ++bad=drop foo.txt
+	:e ++enc=xxx ++bad=? foo.txt
 
 ccomplete:
 - When an option is set: In completion mode and the user types (identifier)
@@ -100,6 +107,9 @@ Mac unicode patch (Da Woon Jung):
 - With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
   (Alan Schmitt)
 
+Mac: drop support for OS 9?  Most people are now using OS/X and Vim 6.4 can be
+used for others.
+
 Patch to add a few flags to search(). (Benji Fisher, Nov 22)
 
 Win32: Use the free downloadable compiler 7.1.  Figure out how to do debugging
diff --git a/runtime/keymap/tamil_tscii.vim b/runtime/keymap/tamil_tscii.vim
index fa07c1727..f2bb6caea 100644
--- a/runtime/keymap/tamil_tscii.vim
+++ b/runtime/keymap/tamil_tscii.vim
@@ -1,572 +1,572 @@
-" Keymap file for the editing Tamil language files in TSCII encoding.

-"

-" Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com)

-" Last updated: August 4, 2005

-"

-" You will need a fixed width TSCII font to use this encoding.  The

-" Avarangal TSCII fixed width font (TSC_AvarangalFxd) is used to test

-" this keymap.

-"

-" Visit http://www.tscii.org for more information about the TSCII

-" encoding.

-" 

-let b:keymap_name = "tamil_tscii"

-

-loadkeymap

-

-" Uyir (Vowels) letters

-a      <char-171>

-aa     <char-172>

-A      <char-172>

-i      <char-173>

-ii     <char-174>

-I      <char-174>

-u      <char-175>

-uu     <char-176>

-U      <char-176>

-e      <char-177>

-ee     <char-178>

-E      <char-178>

-ai     <char-179>

-o      <char-180>

-oo     <char-181>

-O      <char-181>

-au     <char-182>

-q      <char-183>

-

-" mey (Consonants) letters

-k      <char-236>

-ka     <char-184>

-kaa    <char-184><char-161>

-kA     <char-184><char-161>

-ki     <char-184><char-162>

-kii    <char-184><char-163>

-kI     <char-184><char-163>

-ku     <char-204>

-kuu    <char-220>

-kU     <char-220>

-ke     <char-166><char-184>

-kee    <char-167><char-184>

-kE     <char-167><char-184>

-kai    <char-168><char-184>

-ko     <char-166><char-184><char-161>

-koo    <char-167><char-184><char-161>

-kO     <char-167><char-184><char-161>

-kau    <char-166><char-184><char-199>

-

-g      <char-236>

-ga     <char-184>

-gaa    <char-184><char-161>

-gA     <char-184><char-161>

-gi     <char-184><char-162>

-gii    <char-184><char-163>

-gI     <char-184><char-163>

-gu     <char-204>

-guu    <char-220>

-gU     <char-220>

-ge     <char-166><char-184>

-gee    <char-167><char-184>

-gE     <char-167><char-184>

-gai    <char-168><char-184>

-go     <char-166><char-184><char-161>

-goo    <char-167><char-184><char-161>

-gO     <char-167><char-184><char-161>

-gau    <char-166><char-184><char-199>

-

-ng     <char-237>

-nga    <char-185>

-ngaa   <char-185><char-161>

-ngA    <char-185><char-161>

-ngi    <char-185><char-162>

-ngii   <char-185><char-163>

-ngI    <char-185><char-163>

-ngu    <char-153>

-nguu   <char-155>

-ngU    <char-155>

-nge    <char-166><char-185>

-ngee   <char-167><char-185>

-ngE    <char-167><char-185>

-ngai   <char-168><char-185>

-ngo    <char-166><char-185><char-161>

-ngoo   <char-167><char-185><char-161>

-ngO    <char-167><char-185><char-161>

-ngau   <char-166><char-185><char-199>

-

-ch     <char-238>

-cha    <char-186>

-chaa   <char-186><char-161>

-chA    <char-186><char-161>

-chi    <char-186><char-162>

-chii   <char-186><char-163>

-chI    <char-186><char-163>

-chu    <char-204>

-chuu   <char-221>

-chU    <char-221>

-che    <char-166><char-186>

-chee   <char-167><char-186>

-chE    <char-167><char-186>

-chai   <char-168><char-186>

-cho    <char-166><char-186><char-161>

-choo   <char-167><char-186><char-161>

-chO    <char-167><char-186><char-161>

-chau   <char-166><char-186><char-199>

-

-s      <char-238>

-sa     <char-186>

-saa    <char-186><char-161>

-sA     <char-186><char-161>

-si     <char-186><char-162>

-sii    <char-186><char-163>

-sI     <char-186><char-163>

-su     <char-204>

-suu    <char-221>

-sU     <char-221>

-se     <char-166><char-186>

-see    <char-167><char-186>

-sE     <char-167><char-186>

-sai    <char-168><char-186>

-so     <char-166><char-186><char-161>

-soo    <char-167><char-186><char-161>

-sO     <char-167><char-186><char-161>

-sau    <char-166><char-186><char-199>

-

-nj     <char-239>

-nja    <char-187>

-njaa   <char-187><char-161>

-njA    <char-187><char-161>

-nji    <char-187><char-162>

-njii   <char-187><char-163>

-njI    <char-187><char-163>

-nju    <char-154>

-njuu   <char-156>

-njU    <char-156>

-nje    <char-166><char-187>

-njee   <char-167><char-187>

-njE    <char-167><char-187>

-njai   <char-168><char-187>

-njo    <char-166><char-187><char-161>

-njoo   <char-167><char-187><char-161>

-njO    <char-167><char-187><char-161>

-njau   <char-166><char-187><char-199>

-

-t      <char-240>

-ta     <char-188>

-taa    <char-188><char-161>

-tA     <char-188><char-161>

-ti     <char-202>

-tii    <char-203>

-tI     <char-203>

-tu     <char-206>

-tuu    <char-222>

-tU     <char-222>

-te     <char-166><char-188>

-tee    <char-167><char-188>

-tE     <char-167><char-188>

-tai    <char-168><char-188>

-to     <char-166><char-188><char-161>

-too    <char-167><char-188><char-161>

-tO     <char-167><char-188><char-161>

-tau    <char-166><char-188><char-199>

-

-d      <char-240>

-da     <char-188>

-daa    <char-188><char-161>

-dA     <char-188><char-161>

-di     <char-202>

-dii    <char-203>

-dI     <char-203>

-du     <char-206>

-duu    <char-222>

-dU     <char-222>

-de     <char-166><char-188>

-dee    <char-167><char-188>

-dE     <char-167><char-188>

-dai    <char-168><char-188>

-do     <char-166><char-188><char-161>

-doo    <char-167><char-188><char-161>

-dO     <char-167><char-188><char-161>

-dau    <char-166><char-188><char-199>

-

-N      <char-241>

-Na     <char-189>

-Naa    <char-189><char-161>

-NA     <char-189><char-161>

-Ni     <char-189><char-162>

-Nii    <char-189><char-163>

-NI     <char-189><char-163>

-Nu     <char-207>

-Nuu    <char-223>

-NU     <char-223>

-Ne     <char-166><char-189>

-Nee    <char-167><char-189>

-NE     <char-167><char-189>

-Nai    <char-168><char-189>

-No     <char-166><char-189><char-161>

-Noo    <char-167><char-189><char-161>

-NO     <char-167><char-189><char-161>

-Nau    <char-166><char-189><char-199>

-

-th     <char-242>

-tha    <char-190>

-thaa   <char-190><char-161>

-thA    <char-190><char-161>

-thi    <char-190><char-162>

-thii   <char-190><char-163>

-thI    <char-190><char-163>

-thu    <char-208>

-thuu   <char-224>

-thU    <char-224>

-the    <char-166><char-190>

-thee   <char-167><char-190>

-thE    <char-167><char-190>

-thai   <char-168><char-190>

-tho    <char-166><char-190><char-161>

-thoo   <char-167><char-190><char-161>

-thO    <char-167><char-190><char-161>

-thau   <char-166><char-190><char-199>

-

-w      <char-243>

-wa     <char-191>

-waa    <char-191><char-161>

-wA     <char-191><char-161>

-wi     <char-191><char-162>

-wii    <char-191><char-163>

-wI     <char-191><char-163>

-wu     <char-209>

-wuu    <char-225>

-wU     <char-225>

-we     <char-166><char-191>

-wee    <char-167><char-191>

-wE     <char-167><char-191>

-wai    <char-168><char-191>

-wo     <char-166><char-191><char-161>

-woo    <char-167><char-191><char-161>

-wO     <char-167><char-191><char-161>

-wau    <char-166><char-191><char-199>

-

-n-     <char-243>

-n-a    <char-191>

-n-aa   <char-191><char-161>

-n-A    <char-191><char-161>

-n-i    <char-191><char-162>

-n-ii   <char-191><char-163>

-n-I    <char-191><char-163>

-n-u    <char-209>

-n-uu   <char-225>

-n-U    <char-225>

-n-e    <char-166><char-191>

-n-ee   <char-167><char-191>

-n-E    <char-167><char-191>

-n-ai   <char-168><char-191>

-n-o    <char-166><char-191><char-161>

-n-oo   <char-167><char-191><char-161>

-n-O    <char-167><char-191><char-161>

-n-au   <char-166><char-191><char-199>

-

-p      <char-244>

-pa     <char-192>

-paa    <char-192><char-161>

-pA     <char-192><char-161>

-pi     <char-192><char-162>

-pii    <char-192><char-163>

-pI     <char-192><char-163>

-pu     <char-210>

-puu    <char-226>

-pU     <char-226>

-pe     <char-166><char-192>

-pee    <char-167><char-192>

-pE     <char-167><char-192>

-pai    <char-168><char-192>

-po     <char-166><char-192><char-161>

-poo    <char-167><char-192><char-161>

-pO     <char-167><char-192><char-161>

-pau    <char-166><char-192><char-199>

-

-b      <char-244>

-ba     <char-192>

-baa    <char-192><char-161>

-bA     <char-192><char-161>

-bi     <char-192><char-162>

-bii    <char-192><char-163>

-bI     <char-192><char-163>

-bu     <char-210>

-buu    <char-226>

-bU     <char-226>

-be     <char-166><char-192>

-bee    <char-167><char-192>

-bE     <char-167><char-192>

-bai    <char-168><char-192>

-bo     <char-166><char-192><char-161>

-boo    <char-167><char-192><char-161>

-bO     <char-167><char-192><char-161>

-bau    <char-166><char-192><char-199>

-

-m      <char-245>

-ma     <char-193>

-maa    <char-193><char-161>

-mA     <char-193><char-161>

-mi     <char-193><char-162>

-mii    <char-193><char-163>

-mI     <char-193><char-163>

-mu     <char-211>

-muu    <char-227>

-mU     <char-227>

-me     <char-166><char-193>

-mee    <char-167><char-193>

-mE     <char-167><char-193>

-mai    <char-168><char-193>

-mo     <char-166><char-193><char-161>

-moo    <char-167><char-193><char-161>

-mO     <char-167><char-193><char-161>

-mau    <char-166><char-193><char-199>

-

-y      <char-246>

-ya     <char-194>

-yaa    <char-194><char-161>

-yA     <char-194><char-161>

-yi     <char-194><char-162>

-yii    <char-194><char-163>

-yI     <char-194><char-163>

-yu     <char-212>

-yuu    <char-228>

-yU     <char-228>

-ye     <char-166><char-194>

-yee    <char-167><char-194>

-yE     <char-167><char-194>

-yai    <char-168><char-194>

-yo     <char-166><char-194><char-161>

-yoo    <char-167><char-194><char-161>

-yO     <char-167><char-194><char-161>

-yau    <char-166><char-194><char-199>

-

-r      <char-247>

-ra     <char-195>

-raa    <char-195><char-161>

-rA     <char-195><char-161>

-ri     <char-195><char-162>

-rii    <char-195><char-163>

-rI     <char-195><char-163>

-ru     <char-213>

-ruu    <char-229>

-rU     <char-229>

-re     <char-166><char-195>

-ree    <char-167><char-195>

-rE     <char-167><char-195>

-rai    <char-168><char-195>

-ro     <char-166><char-195><char-161>

-roo    <char-167><char-195><char-161>

-rO     <char-167><char-195><char-161>

-rau    <char-166><char-195><char-199>

-

-l      <char-248>

-la     <char-196>

-laa    <char-196><char-161>

-lA     <char-196><char-161>

-li     <char-196><char-162>

-lii    <char-196><char-163>

-lI     <char-196><char-163>

-lu     <char-214>

-luu    <char-230>

-lU     <char-230>

-le     <char-166><char-196>

-lee    <char-167><char-196>

-lE     <char-167><char-196>

-lai    <char-168><char-196>

-lo     <char-166><char-196><char-161>

-loo    <char-167><char-196><char-161>

-lO     <char-167><char-196><char-161>

-lau    <char-166><char-196><char-199>

-

-v      <char-249>

-va     <char-197>

-vaa    <char-197><char-161>

-vA     <char-197><char-161>

-vi     <char-197><char-162>

-vii    <char-197><char-163>

-vI     <char-197><char-163>

-vu     <char-215>

-vuu    <char-231>

-vU     <char-231>

-ve     <char-166><char-197>

-vee    <char-167><char-197>

-vE     <char-167><char-197>

-vai    <char-168><char-197>

-vo     <char-166><char-197><char-161>

-voo    <char-167><char-197><char-161>

-vO     <char-167><char-197><char-161>

-vau    <char-166><char-197><char-199>

-

-z      <char-250>

-za     <char-198>

-zaa    <char-198><char-161>

-zA     <char-198><char-161>

-zi     <char-198><char-162>

-zii    <char-198><char-163>

-zI     <char-198><char-163>

-zu     <char-216>

-zuu    <char-232>

-zU     <char-232>

-ze     <char-166><char-198>

-zee    <char-167><char-198>

-zE     <char-167><char-198>

-zai    <char-168><char-198>

-zo     <char-166><char-198><char-161>

-zoo    <char-167><char-198><char-161>

-zO     <char-167><char-198><char-161>

-zau    <char-166><char-198><char-199>

-

-L      <char-251>

-La     <char-199>

-Laa    <char-199><char-161>

-LA     <char-199><char-161>

-Li     <char-199><char-162>

-Lii    <char-199><char-163>

-LI     <char-199><char-163>

-Lu     <char-217>

-Luu    <char-233>

-LU     <char-233>

-Le     <char-166><char-199>

-Lee    <char-167><char-199>

-LE     <char-167><char-199>

-Lai    <char-168><char-199>

-Lo     <char-166><char-199><char-161>

-Loo    <char-167><char-199><char-161>

-LO     <char-167><char-199><char-161>

-Lau    <char-166><char-199><char-199>

-

-R      <char-252>

-Ra     <char-200>

-Raa    <char-200><char-161>

-RA     <char-200><char-161>

-Ri     <char-200><char-162>

-Rii    <char-200><char-163>

-RI     <char-200><char-163>

-Ru     <char-218>

-Ruu    <char-234>

-RU     <char-234>

-Re     <char-166><char-200>

-Ree    <char-167><char-200>

-RE     <char-167><char-200>

-Rai    <char-168><char-200>

-Ro     <char-166><char-200><char-161>

-Roo    <char-167><char-200><char-161>

-RO     <char-167><char-200><char-161>

-Rau    <char-166><char-200><char-199>

-

-n      <char-253>

-na     <char-201>

-naa    <char-201><char-161>

-nA     <char-201><char-161>

-ni     <char-201><char-162>

-nii    <char-201><char-163>

-nI     <char-201><char-163>

-nu     <char-219>

-nuu    <char-235>

-nU     <char-235>

-ne     <char-166><char-201>

-nee    <char-167><char-201>

-nE     <char-167><char-201>

-nai    <char-168><char-201>

-no     <char-166><char-201><char-161>

-noo    <char-167><char-201><char-161>

-nO     <char-167><char-201><char-161>

-nau    <char-166><char-201><char-199>

-

-" Grantha letters

-j      <char-136>

-ja     <char-131>

-jaa    <char-131><char-161>

-jA     <char-131><char-161>

-ji     <char-131><char-162>

-jii    <char-131><char-163>

-jI     <char-131><char-163>

-ju     <char-131><char-164>

-juu    <char-131><char-164>

-jU     <char-131><char-165>

-je     <char-166><char-131>

-jee    <char-167><char-131>

-jE     <char-167><char-131>

-jai    <char-168><char-131>

-jo     <char-166><char-131><char-161>

-joo    <char-167><char-131><char-161>

-jO     <char-167><char-131><char-161>

-jau    <char-166><char-131><char-199>

-

-sh     <char-137>

-sha    <char-132>

-shaa   <char-132><char-161>

-shA    <char-132><char-161>

-shi    <char-132><char-162>

-shii   <char-132><char-163>

-shI    <char-132><char-163>

-shu    <char-131><char-164>

-shuu   <char-131><char-164>

-shU    <char-131><char-165>

-she    <char-166><char-132>

-shee   <char-167><char-132>

-shE    <char-167><char-132>

-shai   <char-168><char-132>

-sho    <char-166><char-132><char-161>

-shoo   <char-167><char-132><char-161>

-shO    <char-167><char-132><char-161>

-shau   <char-166><char-132><char-199>

-

-S      <char-138>

-Sa     <char-133>

-Saa    <char-133><char-161>

-SA     <char-133><char-161>

-Si     <char-133><char-162>

-Sii    <char-133><char-163>

-SI     <char-133><char-163>

-Su     <char-133><char-164>

-Suu    <char-133><char-165>

-SU     <char-133><char-165>

-Se     <char-166><char-133>

-See    <char-167><char-133>

-SE     <char-167><char-133>

-Sai    <char-168><char-133>

-So     <char-166><char-133><char-161>

-Soo    <char-167><char-133><char-161>

-SO     <char-167><char-133><char-161>

-Sau    <char-166><char-133><char-199>

-

-h      <char-139>

-ha     <char-134>

-haa    <char-134><char-161>

-hA     <char-134><char-161>

-hi     <char-134><char-162>

-hii    <char-134><char-163>

-hI     <char-134><char-163>

-hu     <char-134><char-164>

-huu    <char-134><char-165>

-hU     <char-134><char-165>

-he     <char-166><char-134>

-hee    <char-167><char-134>

-hE     <char-167><char-134>

-hai    <char-168><char-134>

-ho     <char-166><char-134><char-161>

-hoo    <char-167><char-134><char-161>

-hO     <char-167><char-134><char-161>

-hau    <char-166><char-134><char-199>

-

-x      <char-140>

-xa     <char-135>

-xaa    <char-135><char-161>

-xA     <char-135><char-161>

-xi     <char-135><char-162>

-xii    <char-135><char-163>

-xI     <char-135><char-163>

-xu     <char-135><char-164>

-xuu    <char-135><char-165>

-xU     <char-135><char-165>

-xe     <char-166><char-135>

-xee    <char-167><char-135>

-xE     <char-167><char-135>

-xai    <char-168><char-135>

-xo     <char-166><char-135><char-161>

-xoo    <char-167><char-135><char-161>

-xO     <char-167><char-135><char-161>

-xau    <char-166><char-135><char-199>

-

-sri     <char-130>

-

+" Keymap file for the editing Tamil language files in TSCII encoding.
+"
+" Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
+" Last updated: August 4, 2005
+"
+" You will need a fixed width TSCII font to use this encoding.  The
+" Avarangal TSCII fixed width font (TSC_AvarangalFxd) is used to test
+" this keymap.
+"
+" Visit http://www.tscii.org for more information about the TSCII
+" encoding.
+" 
+let b:keymap_name = "tamil_tscii"
+
+loadkeymap
+
+" Uyir (Vowels) letters
+a      <char-171>
+aa     <char-172>
+A      <char-172>
+i      <char-173>
+ii     <char-174>
+I      <char-174>
+u      <char-175>
+uu     <char-176>
+U      <char-176>
+e      <char-177>
+ee     <char-178>
+E      <char-178>
+ai     <char-179>
+o      <char-180>
+oo     <char-181>
+O      <char-181>
+au     <char-182>
+q      <char-183>
+
+" mey (Consonants) letters
+k      <char-236>
+ka     <char-184>
+kaa    <char-184><char-161>
+kA     <char-184><char-161>
+ki     <char-184><char-162>
+kii    <char-184><char-163>
+kI     <char-184><char-163>
+ku     <char-204>
+kuu    <char-220>
+kU     <char-220>
+ke     <char-166><char-184>
+kee    <char-167><char-184>
+kE     <char-167><char-184>
+kai    <char-168><char-184>
+ko     <char-166><char-184><char-161>
+koo    <char-167><char-184><char-161>
+kO     <char-167><char-184><char-161>
+kau    <char-166><char-184><char-199>
+
+g      <char-236>
+ga     <char-184>
+gaa    <char-184><char-161>
+gA     <char-184><char-161>
+gi     <char-184><char-162>
+gii    <char-184><char-163>
+gI     <char-184><char-163>
+gu     <char-204>
+guu    <char-220>
+gU     <char-220>
+ge     <char-166><char-184>
+gee    <char-167><char-184>
+gE     <char-167><char-184>
+gai    <char-168><char-184>
+go     <char-166><char-184><char-161>
+goo    <char-167><char-184><char-161>
+gO     <char-167><char-184><char-161>
+gau    <char-166><char-184><char-199>
+
+ng     <char-237>
+nga    <char-185>
+ngaa   <char-185><char-161>
+ngA    <char-185><char-161>
+ngi    <char-185><char-162>
+ngii   <char-185><char-163>
+ngI    <char-185><char-163>
+ngu    <char-153>
+nguu   <char-155>
+ngU    <char-155>
+nge    <char-166><char-185>
+ngee   <char-167><char-185>
+ngE    <char-167><char-185>
+ngai   <char-168><char-185>
+ngo    <char-166><char-185><char-161>
+ngoo   <char-167><char-185><char-161>
+ngO    <char-167><char-185><char-161>
+ngau   <char-166><char-185><char-199>
+
+ch     <char-238>
+cha    <char-186>
+chaa   <char-186><char-161>
+chA    <char-186><char-161>
+chi    <char-186><char-162>
+chii   <char-186><char-163>
+chI    <char-186><char-163>
+chu    <char-204>
+chuu   <char-221>
+chU    <char-221>
+che    <char-166><char-186>
+chee   <char-167><char-186>
+chE    <char-167><char-186>
+chai   <char-168><char-186>
+cho    <char-166><char-186><char-161>
+choo   <char-167><char-186><char-161>
+chO    <char-167><char-186><char-161>
+chau   <char-166><char-186><char-199>
+
+s      <char-238>
+sa     <char-186>
+saa    <char-186><char-161>
+sA     <char-186><char-161>
+si     <char-186><char-162>
+sii    <char-186><char-163>
+sI     <char-186><char-163>
+su     <char-204>
+suu    <char-221>
+sU     <char-221>
+se     <char-166><char-186>
+see    <char-167><char-186>
+sE     <char-167><char-186>
+sai    <char-168><char-186>
+so     <char-166><char-186><char-161>
+soo    <char-167><char-186><char-161>
+sO     <char-167><char-186><char-161>
+sau    <char-166><char-186><char-199>
+
+nj     <char-239>
+nja    <char-187>
+njaa   <char-187><char-161>
+njA    <char-187><char-161>
+nji    <char-187><char-162>
+njii   <char-187><char-163>
+njI    <char-187><char-163>
+nju    <char-154>
+njuu   <char-156>
+njU    <char-156>
+nje    <char-166><char-187>
+njee   <char-167><char-187>
+njE    <char-167><char-187>
+njai   <char-168><char-187>
+njo    <char-166><char-187><char-161>
+njoo   <char-167><char-187><char-161>
+njO    <char-167><char-187><char-161>
+njau   <char-166><char-187><char-199>
+
+t      <char-240>
+ta     <char-188>
+taa    <char-188><char-161>
+tA     <char-188><char-161>
+ti     <char-202>
+tii    <char-203>
+tI     <char-203>
+tu     <char-206>
+tuu    <char-222>
+tU     <char-222>
+te     <char-166><char-188>
+tee    <char-167><char-188>
+tE     <char-167><char-188>
+tai    <char-168><char-188>
+to     <char-166><char-188><char-161>
+too    <char-167><char-188><char-161>
+tO     <char-167><char-188><char-161>
+tau    <char-166><char-188><char-199>
+
+d      <char-240>
+da     <char-188>
+daa    <char-188><char-161>
+dA     <char-188><char-161>
+di     <char-202>
+dii    <char-203>
+dI     <char-203>
+du     <char-206>
+duu    <char-222>
+dU     <char-222>
+de     <char-166><char-188>
+dee    <char-167><char-188>
+dE     <char-167><char-188>
+dai    <char-168><char-188>
+do     <char-166><char-188><char-161>
+doo    <char-167><char-188><char-161>
+dO     <char-167><char-188><char-161>
+dau    <char-166><char-188><char-199>
+
+N      <char-241>
+Na     <char-189>
+Naa    <char-189><char-161>
+NA     <char-189><char-161>
+Ni     <char-189><char-162>
+Nii    <char-189><char-163>
+NI     <char-189><char-163>
+Nu     <char-207>
+Nuu    <char-223>
+NU     <char-223>
+Ne     <char-166><char-189>
+Nee    <char-167><char-189>
+NE     <char-167><char-189>
+Nai    <char-168><char-189>
+No     <char-166><char-189><char-161>
+Noo    <char-167><char-189><char-161>
+NO     <char-167><char-189><char-161>
+Nau    <char-166><char-189><char-199>
+
+th     <char-242>
+tha    <char-190>
+thaa   <char-190><char-161>
+thA    <char-190><char-161>
+thi    <char-190><char-162>
+thii   <char-190><char-163>
+thI    <char-190><char-163>
+thu    <char-208>
+thuu   <char-224>
+thU    <char-224>
+the    <char-166><char-190>
+thee   <char-167><char-190>
+thE    <char-167><char-190>
+thai   <char-168><char-190>
+tho    <char-166><char-190><char-161>
+thoo   <char-167><char-190><char-161>
+thO    <char-167><char-190><char-161>
+thau   <char-166><char-190><char-199>
+
+w      <char-243>
+wa     <char-191>
+waa    <char-191><char-161>
+wA     <char-191><char-161>
+wi     <char-191><char-162>
+wii    <char-191><char-163>
+wI     <char-191><char-163>
+wu     <char-209>
+wuu    <char-225>
+wU     <char-225>
+we     <char-166><char-191>
+wee    <char-167><char-191>
+wE     <char-167><char-191>
+wai    <char-168><char-191>
+wo     <char-166><char-191><char-161>
+woo    <char-167><char-191><char-161>
+wO     <char-167><char-191><char-161>
+wau    <char-166><char-191><char-199>
+
+n-     <char-243>
+n-a    <char-191>
+n-aa   <char-191><char-161>
+n-A    <char-191><char-161>
+n-i    <char-191><char-162>
+n-ii   <char-191><char-163>
+n-I    <char-191><char-163>
+n-u    <char-209>
+n-uu   <char-225>
+n-U    <char-225>
+n-e    <char-166><char-191>
+n-ee   <char-167><char-191>
+n-E    <char-167><char-191>
+n-ai   <char-168><char-191>
+n-o    <char-166><char-191><char-161>
+n-oo   <char-167><char-191><char-161>
+n-O    <char-167><char-191><char-161>
+n-au   <char-166><char-191><char-199>
+
+p      <char-244>
+pa     <char-192>
+paa    <char-192><char-161>
+pA     <char-192><char-161>
+pi     <char-192><char-162>
+pii    <char-192><char-163>
+pI     <char-192><char-163>
+pu     <char-210>
+puu    <char-226>
+pU     <char-226>
+pe     <char-166><char-192>
+pee    <char-167><char-192>
+pE     <char-167><char-192>
+pai    <char-168><char-192>
+po     <char-166><char-192><char-161>
+poo    <char-167><char-192><char-161>
+pO     <char-167><char-192><char-161>
+pau    <char-166><char-192><char-199>
+
+b      <char-244>
+ba     <char-192>
+baa    <char-192><char-161>
+bA     <char-192><char-161>
+bi     <char-192><char-162>
+bii    <char-192><char-163>
+bI     <char-192><char-163>
+bu     <char-210>
+buu    <char-226>
+bU     <char-226>
+be     <char-166><char-192>
+bee    <char-167><char-192>
+bE     <char-167><char-192>
+bai    <char-168><char-192>
+bo     <char-166><char-192><char-161>
+boo    <char-167><char-192><char-161>
+bO     <char-167><char-192><char-161>
+bau    <char-166><char-192><char-199>
+
+m      <char-245>
+ma     <char-193>
+maa    <char-193><char-161>
+mA     <char-193><char-161>
+mi     <char-193><char-162>
+mii    <char-193><char-163>
+mI     <char-193><char-163>
+mu     <char-211>
+muu    <char-227>
+mU     <char-227>
+me     <char-166><char-193>
+mee    <char-167><char-193>
+mE     <char-167><char-193>
+mai    <char-168><char-193>
+mo     <char-166><char-193><char-161>
+moo    <char-167><char-193><char-161>
+mO     <char-167><char-193><char-161>
+mau    <char-166><char-193><char-199>
+
+y      <char-246>
+ya     <char-194>
+yaa    <char-194><char-161>
+yA     <char-194><char-161>
+yi     <char-194><char-162>
+yii    <char-194><char-163>
+yI     <char-194><char-163>
+yu     <char-212>
+yuu    <char-228>
+yU     <char-228>
+ye     <char-166><char-194>
+yee    <char-167><char-194>
+yE     <char-167><char-194>
+yai    <char-168><char-194>
+yo     <char-166><char-194><char-161>
+yoo    <char-167><char-194><char-161>
+yO     <char-167><char-194><char-161>
+yau    <char-166><char-194><char-199>
+
+r      <char-247>
+ra     <char-195>
+raa    <char-195><char-161>
+rA     <char-195><char-161>
+ri     <char-195><char-162>
+rii    <char-195><char-163>
+rI     <char-195><char-163>
+ru     <char-213>
+ruu    <char-229>
+rU     <char-229>
+re     <char-166><char-195>
+ree    <char-167><char-195>
+rE     <char-167><char-195>
+rai    <char-168><char-195>
+ro     <char-166><char-195><char-161>
+roo    <char-167><char-195><char-161>
+rO     <char-167><char-195><char-161>
+rau    <char-166><char-195><char-199>
+
+l      <char-248>
+la     <char-196>
+laa    <char-196><char-161>
+lA     <char-196><char-161>
+li     <char-196><char-162>
+lii    <char-196><char-163>
+lI     <char-196><char-163>
+lu     <char-214>
+luu    <char-230>
+lU     <char-230>
+le     <char-166><char-196>
+lee    <char-167><char-196>
+lE     <char-167><char-196>
+lai    <char-168><char-196>
+lo     <char-166><char-196><char-161>
+loo    <char-167><char-196><char-161>
+lO     <char-167><char-196><char-161>
+lau    <char-166><char-196><char-199>
+
+v      <char-249>
+va     <char-197>
+vaa    <char-197><char-161>
+vA     <char-197><char-161>
+vi     <char-197><char-162>
+vii    <char-197><char-163>
+vI     <char-197><char-163>
+vu     <char-215>
+vuu    <char-231>
+vU     <char-231>
+ve     <char-166><char-197>
+vee    <char-167><char-197>
+vE     <char-167><char-197>
+vai    <char-168><char-197>
+vo     <char-166><char-197><char-161>
+voo    <char-167><char-197><char-161>
+vO     <char-167><char-197><char-161>
+vau    <char-166><char-197><char-199>
+
+z      <char-250>
+za     <char-198>
+zaa    <char-198><char-161>
+zA     <char-198><char-161>
+zi     <char-198><char-162>
+zii    <char-198><char-163>
+zI     <char-198><char-163>
+zu     <char-216>
+zuu    <char-232>
+zU     <char-232>
+ze     <char-166><char-198>
+zee    <char-167><char-198>
+zE     <char-167><char-198>
+zai    <char-168><char-198>
+zo     <char-166><char-198><char-161>
+zoo    <char-167><char-198><char-161>
+zO     <char-167><char-198><char-161>
+zau    <char-166><char-198><char-199>
+
+L      <char-251>
+La     <char-199>
+Laa    <char-199><char-161>
+LA     <char-199><char-161>
+Li     <char-199><char-162>
+Lii    <char-199><char-163>
+LI     <char-199><char-163>
+Lu     <char-217>
+Luu    <char-233>
+LU     <char-233>
+Le     <char-166><char-199>
+Lee    <char-167><char-199>
+LE     <char-167><char-199>
+Lai    <char-168><char-199>
+Lo     <char-166><char-199><char-161>
+Loo    <char-167><char-199><char-161>
+LO     <char-167><char-199><char-161>
+Lau    <char-166><char-199><char-199>
+
+R      <char-252>
+Ra     <char-200>
+Raa    <char-200><char-161>
+RA     <char-200><char-161>
+Ri     <char-200><char-162>
+Rii    <char-200><char-163>
+RI     <char-200><char-163>
+Ru     <char-218>
+Ruu    <char-234>
+RU     <char-234>
+Re     <char-166><char-200>
+Ree    <char-167><char-200>
+RE     <char-167><char-200>
+Rai    <char-168><char-200>
+Ro     <char-166><char-200><char-161>
+Roo    <char-167><char-200><char-161>
+RO     <char-167><char-200><char-161>
+Rau    <char-166><char-200><char-199>
+
+n      <char-253>
+na     <char-201>
+naa    <char-201><char-161>
+nA     <char-201><char-161>
+ni     <char-201><char-162>
+nii    <char-201><char-163>
+nI     <char-201><char-163>
+nu     <char-219>
+nuu    <char-235>
+nU     <char-235>
+ne     <char-166><char-201>
+nee    <char-167><char-201>
+nE     <char-167><char-201>
+nai    <char-168><char-201>
+no     <char-166><char-201><char-161>
+noo    <char-167><char-201><char-161>
+nO     <char-167><char-201><char-161>
+nau    <char-166><char-201><char-199>
+
+" Grantha letters
+j      <char-136>
+ja     <char-131>
+jaa    <char-131><char-161>
+jA     <char-131><char-161>
+ji     <char-131><char-162>
+jii    <char-131><char-163>
+jI     <char-131><char-163>
+ju     <char-131><char-164>
+juu    <char-131><char-164>
+jU     <char-131><char-165>
+je     <char-166><char-131>
+jee    <char-167><char-131>
+jE     <char-167><char-131>
+jai    <char-168><char-131>
+jo     <char-166><char-131><char-161>
+joo    <char-167><char-131><char-161>
+jO     <char-167><char-131><char-161>
+jau    <char-166><char-131><char-199>
+
+sh     <char-137>
+sha    <char-132>
+shaa   <char-132><char-161>
+shA    <char-132><char-161>
+shi    <char-132><char-162>
+shii   <char-132><char-163>
+shI    <char-132><char-163>
+shu    <char-131><char-164>
+shuu   <char-131><char-164>
+shU    <char-131><char-165>
+she    <char-166><char-132>
+shee   <char-167><char-132>
+shE    <char-167><char-132>
+shai   <char-168><char-132>
+sho    <char-166><char-132><char-161>
+shoo   <char-167><char-132><char-161>
+shO    <char-167><char-132><char-161>
+shau   <char-166><char-132><char-199>
+
+S      <char-138>
+Sa     <char-133>
+Saa    <char-133><char-161>
+SA     <char-133><char-161>
+Si     <char-133><char-162>
+Sii    <char-133><char-163>
+SI     <char-133><char-163>
+Su     <char-133><char-164>
+Suu    <char-133><char-165>
+SU     <char-133><char-165>
+Se     <char-166><char-133>
+See    <char-167><char-133>
+SE     <char-167><char-133>
+Sai    <char-168><char-133>
+So     <char-166><char-133><char-161>
+Soo    <char-167><char-133><char-161>
+SO     <char-167><char-133><char-161>
+Sau    <char-166><char-133><char-199>
+
+h      <char-139>
+ha     <char-134>
+haa    <char-134><char-161>
+hA     <char-134><char-161>
+hi     <char-134><char-162>
+hii    <char-134><char-163>
+hI     <char-134><char-163>
+hu     <char-134><char-164>
+huu    <char-134><char-165>
+hU     <char-134><char-165>
+he     <char-166><char-134>
+hee    <char-167><char-134>
+hE     <char-167><char-134>
+hai    <char-168><char-134>
+ho     <char-166><char-134><char-161>
+hoo    <char-167><char-134><char-161>
+hO     <char-167><char-134><char-161>
+hau    <char-166><char-134><char-199>
+
+x      <char-140>
+xa     <char-135>
+xaa    <char-135><char-161>
+xA     <char-135><char-161>
+xi     <char-135><char-162>
+xii    <char-135><char-163>
+xI     <char-135><char-163>
+xu     <char-135><char-164>
+xuu    <char-135><char-165>
+xU     <char-135><char-165>
+xe     <char-166><char-135>
+xee    <char-167><char-135>
+xE     <char-167><char-135>
+xai    <char-168><char-135>
+xo     <char-166><char-135><char-161>
+xoo    <char-167><char-135><char-161>
+xO     <char-167><char-135><char-161>
+xau    <char-166><char-135><char-199>
+
+sri     <char-130>
+
diff --git a/runtime/plugin/NetrwFileHandlers.vim b/runtime/plugin/NetrwFileHandlers.vim
deleted file mode 100644
index 2aa1d9b83..000000000
--- a/runtime/plugin/NetrwFileHandlers.vim
+++ /dev/null
@@ -1,312 +0,0 @@
-" NetrwFileHandlers: contains various extension-based file handlers for
-"                    netrw's browsers' x command ("eXecute launcher")
-" Author:	Charles E. Campbell, Jr.
-" Date:		Aug 15, 2005
-" Version:	6
-" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
-"               Permission is hereby granted to use and distribute this code,
-"               with or without modifications, provided that this copyright
-"               notice is copied with it. Like anything else that's free,
-"               NetrwFileHandlers.vim is provided *as is* and comes with no
-"               warranty of any kind, either expressed or implied. In no
-"               event will the copyright holder be liable for any damages
-"               resulting from the use of this software.
-"
-" Rom 6:23 (WEB) For the wages of sin is death, but the free gift of God {{{1
-"                is eternal life in Christ Jesus our Lord.
-
-" ---------------------------------------------------------------------
-" Load Once: {{{1
-if exists("g:loaded_NetrwFileHandlers") || &cp
- finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-let g:loaded_NetrwFileHandlers= "v6"
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_html: handles html when the user hits "x" when the {{{1
-"                        cursor is atop a *.html file
-fun! NetrwFileHandler_html(pagefile)
-"  call Dfunc("NetrwFileHandler_html(".a:pagefile.")")
-
-  let page= substitute(a:pagefile,'^','file://','')
-
-  if executable("mozilla")
-"   call Decho("executing !mozilla ".page)
-   exe "!mozilla \"".page.'"'
-  elseif executable("netscape")
-"   call Decho("executing !netscape ".page)
-   exe "!netscape \"".page.'"'
-  else
-"   call Dret("NetrwFileHandler_html 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_html 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_htm: handles html when the user hits "x" when the {{{1
-"                        cursor is atop a *.htm file
-fun! NetrwFileHandler_htm(pagefile)
-"  call Dfunc("NetrwFileHandler_htm(".a:pagefile.")")
-
-  let page= substitute(a:pagefile,'^','file://','')
-
-  if executable("mozilla")
-"   call Decho("executing !mozilla ".page)
-   exe "!mozilla \"".page.'"'
-  elseif executable("netscape")
-"   call Decho("executing !netscape ".page)
-   exe "!netscape \"".page.'"'
-  else
-"   call Dret("NetrwFileHandler_htm 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_htm 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_jpg: {{{1
-fun! NetrwFileHandler_jpg(jpgfile)
-"  call Dfunc("NetrwFileHandler_jpg(jpgfile<".a:jpgfile.">)")
-
-  if executable("gimp")
-   exe "silent! !gimp -s ".a:jpgfile
-  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-"   call Decho("silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".escape(a:jpgfile," []|'"))
-   exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:jpgfile.'"'
-  else
-"   call Dret("NetrwFileHandler_jpg 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_jpg 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_gif: {{{1
-fun! NetrwFileHandler_gif(giffile)
-"  call Dfunc("NetrwFileHandler_gif(giffile<".a:giffile.">)")
-
-  if executable("gimp")
-   exe "silent! !gimp -s ".a:giffile
-  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:giffile.'"'
-  else
-"   call Dret("NetrwFileHandler_gif 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_gif 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_png: {{{1
-fun! NetrwFileHandler_png(pngfile)
-"  call Dfunc("NetrwFileHandler_png(pngfile<".a:pngfile.">)")
-
-  if executable("gimp")
-   exe "silent! !gimp -s ".a:pngfile
-  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:pngfile.'"'
-  else
-"   call Dret("NetrwFileHandler_png 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_png 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_pnm: {{{1
-fun! NetrwFileHandler_pnm(pnmfile)
-"  call Dfunc("NetrwFileHandler_pnm(pnmfile<".a:pnmfile.">)")
-
-  if executable("gimp")
-   exe "silent! !gimp -s ".a:pnmfile
-  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:pnmfile.'"'
-  else
-"   call Dret("NetrwFileHandler_pnm 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_pnm 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_bmp: visualize bmp files {{{1
-fun! NetrwFileHandler_bmp(bmpfile)
-"  call Dfunc("NetrwFileHandler_bmp(bmpfile<".a:bmpfile.">)")
-
-  if executable("gimp")
-   exe "silent! !gimp -s ".a:bmpfile
-  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:bmpfile.'"'
-  else
-"   call Dret("NetrwFileHandler_bmp 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_bmp 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_pdf: visualize pdf files {{{1
-fun! NetrwFileHandler_pdf(pdf)
-"  " call Dfunc("NetrwFileHandler_pdf(pdf<".a:pdf.">)")
-  if executable("gs")
-   exe 'silent! !gs "'.a:pdf.'"'
-  else
-"   " call Dret("NetrwFileHandler_pdf 0")
-   return 0
-  endif
-
-"  " call Dret("NetrwFileHandler_pdf 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_doc: visualize doc files {{{1
-fun! NetrwFileHandler_doc(doc)
-"  " call Dfunc("NetrwFileHandler_doc(doc<".a:doc.">)")
-
-  if executable("oowriter")
-   exe 'silent! !oowriter "'.a:doc.'"'
-   redraw!
-  else
-"   " call Dret("NetrwFileHandler_doc 0")
-   return 0
-  endif
-
-"  " call Dret("NetrwFileHandler_doc 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_sxw: visualize sxw files {{{1
-fun! NetrwFileHandler_sxw(sxw)
-"  " call Dfunc("NetrwFileHandler_sxw(sxw<".a:sxw.">)")
-
-  if executable("oowriter")
-   exe 'silent! !oowriter "'.a:sxw.'"'
-   redraw!
-  else
-"   " call Dret("NetrwFileHandler_sxw 0")
-   return 0
-  endif
-
-"  " call Dret("NetrwFileHandler_sxw 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_xls: visualize xls files {{{1
-fun! NetrwFileHandler_xls(xls)
-"  " call Dfunc("NetrwFileHandler_xls(xls<".a:xls.">)")
-
-  if executable("oocalc")
-   exe 'silent! !oocalc "'.a:xls.'"'
-   redraw!
-  else
-"   " call Dret("NetrwFileHandler_xls 0")
-   return 0
-  endif
-
-"  " call Dret("NetrwFileHandler_xls 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_ps: handles PostScript files {{{1
-fun! NetrwFileHandler_ps(ps)
-"  call Dfunc("NetrwFileHandler_ps()")
-  if executable("gs")
-   exe "silent! !gs ".a:ps
-   redraw!
-  elseif executable("ghostscript")
-   exe "silent! !ghostscript ".a:ps
-   redraw!
-  elseif executable("ghostscript")
-   exe "silent! !ghostscript ".a:ps
-   redraw!
-  elseif executable("gswin32")
-   exe "silent! !gswin32 \"".a:ps.'"'
-   redraw!
-  else
-"   call Dret("NetrwFileHandler_ps 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_ps 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_eps: handles encapsulated PostScript files {{{1
-fun! NetrwFileHandler_eps(eps)
-"  call Dfunc("NetrwFileHandler_ps()")
-  if executable("gs")
-   exe "silent! !gs ".a:eps
-   redraw!
-  elseif executable("ghostscript")
-   exe "silent! !ghostscript ".a:eps
-   redraw!
-  elseif executable("ghostscript")
-   exe "silent! !ghostscript ".a:eps
-   redraw!
-  elseif executable("gswin32")
-   exe "silent! !gswin32 \"".a:eps.'"'
-   redraw!
-  else
-"   call Dret("NetrwFileHandler_ps 0")
-   return 0
-  endif
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_fig: handles xfig files {{{1
-fun! NetrwFileHandler_fig(fig)
-"  call Dfunc("NetrwFileHandler_fig()")
-  if executable("xfig")
-   exe "silent! !xfig ".a:fig
-   redraw!
-  else
-"   call Dret("NetrwFileHandler_fig 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_fig 1")
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_obj: handles tgif's obj files {{{1
-fun! NetrwFileHandler_obj(obj)
-"  call Dfunc("NetrwFileHandler_obj()")
-  if has("unix") && executable("tgif")
-   exe "silent! !tgif ".a:obj
-   redraw!
-  else
-"   call Dret("NetrwFileHandler_obj 0")
-   return 0
-  endif
-
-"  call Dret("NetrwFileHandler_obj 1")
-  return 1
-endfun
-
-let &cpo= s:keepcpo
-" ---------------------------------------------------------------------
-"  Modelines: {{{1
-"  vim: ts=4 fdm=marker
diff --git a/runtime/plugin/NetrwPlugin.vim b/runtime/plugin/NetrwPlugin.vim
deleted file mode 100644
index f28c2eb03..000000000
--- a/runtime/plugin/NetrwPlugin.vim
+++ /dev/null
@@ -1,156 +0,0 @@
-" netrw.vim: Handles file transfer and remote directory listing across a network
-"            PLUGIN PORTION
-" Last Change:	Aug 31, 2005
-" Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
-" Version:	67
-" License:	Vim License  (see vim's :help license)
-" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
-" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
-"               Permission is hereby granted to use and distribute this code,
-"               with or without modifications, provided that this copyright
-"               notice is copied with it. Like anything else that's free,
-"               netrw.vim is provided *as is* and comes with no warranty
-"               of any kind, either expressed or implied. By using this
-"               plugin, you agree that in no event will the copyright
-"               holder be liable for any damages resulting from the use
-"               of this software.
-"
-"  But be doers of the Word, and not only hearers, deluding your own selves {{{1
-"  (James 1:22 RSV)
-" =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-" ---------------------------------------------------------------------
-" Load Once: {{{1
-if exists("g:loaded_netrw") || &cp
-  finish
-endif
-if v:version < 600
- echoerr "***netrw*** doesn't support Vim version ".v:version
- finish
-endif
-let g:loaded_netrw  = "v67"
-if v:version < 700
- let loaded_explorer = 1
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-" ---------------------------------------------------------------------
-" Public Interface: {{{1
-
-" Local Browsing: {{{2
-augroup FileExplorer
- au!
- au BufEnter * call s:LocalBrowse(expand("<amatch>"))
-augroup END
-
-" Network Browsing Reading Writing: {{{2
-augroup Network
- au!
- if has("win32") || has("win95") || has("win64") || has("win16")
-  au BufReadCmd  file://*		exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e '.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
- else
-  au BufReadCmd  file:///*		exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
-  au BufReadCmd  file://localhost/*	exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
- endif
- au BufReadCmd   ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://*	exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread 0r ".expand("<amatch>")|exe "silent doau BufReadPost ".expand("<amatch>")
- au FileReadCmd  ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://*	exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread "   .expand("<amatch>")|exe "silent doau FileReadPost ".expand("<amatch>")
- au BufWriteCmd  ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://*    	exe "silent doau BufWritePre ".expand("<amatch>")|exe "Nwrite " .expand("<amatch>")|exe "silent doau BufWritePost ".expand("<amatch>")
- au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://*    	exe "silent doau BufWritePre ".expand("<amatch>")|exe "'[,']Nwrite " .expand("<amatch>")|exe "silent doau FileWritePost ".expand("<amatch>")
-augroup END
-
-" Commands: :Nread, :Nwrite, :NetUserPass {{{2
-com! -nargs=*		Nread		call netrw#NetSavePosn()<bar>call netrw#NetRead(<f-args>)<bar>call netrw#NetRestorePosn()
-com! -range=% -nargs=*	Nwrite		call netrw#NetSavePosn()<bar><line1>,<line2>call netrw#NetWrite(<f-args>)<bar>call netrw#NetRestorePosn()
-com! -nargs=*		NetUserPass	call NetUserPass(<f-args>)
-
-" Commands: :Explore, :Sexplore, Hexplore, Vexplore {{{2
-com! -nargs=? -bar -bang -count=0  	Explore		call netrw#Explore(<count>,0,0+<bang>0,<q-args>)
-com! -nargs=? -bar -bang -count=0  	Sexplore	call netrw#Explore(<count>,1,0+<bang>0,<q-args>)
-com! -nargs=? -bar -bang -count=0  	Hexplore	call netrw#Explore(<count>,1,2+<bang>0,<q-args>)
-com! -nargs=? -bar -bang -count=0  	Vexplore	call netrw#Explore(<count>,1,4+<bang>0,<q-args>)
-com! -nargs=? -bar -bang   		Nexplore	call netrw#Explore(-1,0,0,<q-args>)
-com! -nargs=? -bar -bang   		Pexplore	call netrw#Explore(-2,0,0,<q-args>)
-
-" Commands: NetrwSettings {{{2
-com! -nargs=0 NetrwSettings :call NetrwSettings#NetrwSettings()
-
-" ---------------------------------------------------------------------
-" LocalBrowse: {{{2
-fun! s:LocalBrowse(dirname)
-  " unfortunate interaction -- debugging calls can't be used here;
-  " the BufEnter event causes triggering when attempts to write to
-  " the DBG buffer are made.
-  if isdirectory(a:dirname)
-   call netrw#DirBrowse(a:dirname)
-  endif
-  " not a directory, ignore it
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwStatusLine: {{{1
-fun! NetrwStatusLine()
-"  let g:stlmsg= "Xbufnr=".w:netrw_explore_bufnr." bufnr=".bufnr(".")." Xline#".w:netrw_explore_line." line#".line(".")
-  if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr(".") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
-   let &stl= s:netrw_explore_stl
-   if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
-   if exists("w:netrw_explore_line")|unlet w:netrw_explore_line|endif
-   return ""
-  else
-   return "Match ".w:netrw_explore_mtchcnt." of ".w:netrw_explore_listlen
-  endif
-endfun
-
-" ------------------------------------------------------------------------
-" NetUserPass: set username and password for subsequent ftp transfer {{{1
-"   Usage:  :call NetUserPass()			-- will prompt for userid and password
-"	    :call NetUserPass("uid")		-- will prompt for password
-"	    :call NetUserPass("uid","password") -- sets global userid and password
-fun! NetUserPass(...)
-
- " get/set userid
- if a:0 == 0
-"  call Dfunc("NetUserPass(a:0<".a:0.">)")
-  if !exists("g:netrw_uid") || g:netrw_uid == ""
-   " via prompt
-   let g:netrw_uid= input('Enter username: ')
-  endif
- else	" from command line
-"  call Dfunc("NetUserPass(a:1<".a:1.">) {")
-  let g:netrw_uid= a:1
- endif
-
- " get password
- if a:0 <= 1 " via prompt
-"  call Decho("a:0=".a:0." case <=1:")
-  let g:netrw_passwd= inputsecret("Enter Password: ")
- else " from command line
-"  call Decho("a:0=".a:0." case >1: a:2<".a:2.">")
-  let g:netrw_passwd=a:2
- endif
-"  call Dret("NetUserPass")
-endfun
-
-" ------------------------------------------------------------------------
-" NetReadFixup: this sort of function is typically written by the user {{{1
-"               to handle extra junk that their system's ftp dumps
-"               into the transfer.  This function is provided as an
-"               example and as a fix for a Windows 95 problem: in my
-"               experience, win95's ftp always dumped four blank lines
-"               at the end of the transfer.
-if has("win95") && g:netrw_win95ftp
- fun! NetReadFixup(method, line1, line2)
-"   call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")")
-   if method == 3   " ftp (no <.netrc>)
-    let fourblanklines= line2 - 3
-    silent fourblanklines.",".line2."g/^\s*/d"
-   endif
-"   call Dret("NetReadFixup")
- endfun
-endif
-
-let &cpo= s:keepcpo
-unlet s:keepcpo
-" ------------------------------------------------------------------------
-" Modelines: {{{1
-" vim:ts=8 fdm=marker
diff --git a/runtime/plugin/NetrwSettings.vim b/runtime/plugin/NetrwSettings.vim
deleted file mode 100644
index eecdcd234..000000000
--- a/runtime/plugin/NetrwSettings.vim
+++ /dev/null
@@ -1,157 +0,0 @@
-" NetrwSettings.vim: makes netrw settings simpler
-" Last Change:	Aug 16, 2005
-" Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
-" Version:		3
-" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
-"               Permission is hereby granted to use and distribute this code,
-"               with or without modifications, provided that this copyright
-"               notice is copied with it. Like anything else that's free,
-"               NetrwSettings.vim is provided *as is* and comes with no
-"               warranty of any kind, either expressed or implied. By using
-"               this plugin, you agree that in no event will the copyright
-"               holder be liable for any damages resulting from the use
-"               of this software.
-"
-" Mat 4:23 (WEB) Jesus went about in all Galilee, teaching in their {{{1
-"                synagogues, preaching the gospel of the kingdom, and healing
-"                every disease and every sickness among the people.
-" Load Once: {{{1
-if exists("g:loaded_NetrwSettings") || &cp
-  finish
-endif
-let g:loaded_NetrwSettings  = "v3"
-
-" ---------------------------------------------------------------------
-" NetrwSettings: {{{1
-fun! NetrwSettings#NetrwSettings()
-  " this call is here largely just to insure that netrw has been loaded
-  call netrw#NetSavePosn()
-
-  above wincmd s
-  enew
-  setlocal noswapfile bh=wipe
-  set ft=vim
-  file Netrw\ Settings
-
-  " these variables have the following default effects when they don't
-  " exist (ie. have not been set by the user in his/her .vimrc)
-  if !exists("g:netrw_longlist")
-   let g:netrw_longlist= 0
-   let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
-  endif
-  if !exists("g:netrw_silent")
-   let g:netrw_silent= 0
-  endif
-  if !exists("g:netrw_use_nt_rcp")
-   let g:netrw_use_nt_rcp= 0
-  endif
-  if !exists("g:netrw_ftp")
-   let g:netrw_ftp= 0
-  endif
-  if !exists("g:netrw_ignorenetrc")
-   let g:netrw_ignorenetrc= 0
-  endif
-
-  put ='+ ---------------------------------------------'
-  put ='+ NetrwSettings:  (by Charles E. Campbell, Jr.)'
-  put ='+  Press ? with cursor atop any line for help  '
-  put ='+ ---------------------------------------------'
-  let s:netrw_settings_stop= line(".")
-
-  put =''
-  put ='+ Netrw Protocol Commands'
-  put = 'let g:netrw_dav_cmd           = '.g:netrw_dav_cmd
-  put = 'let g:netrw_fetch_cmd         = '.g:netrw_fetch_cmd
-  put = 'let g:netrw_ftp_cmd           = '.g:netrw_ftp_cmd
-  put = 'let g:netrw_http_cmd          = '.g:netrw_http_cmd
-  put = 'let g:netrw_rcp_cmd           = '.g:netrw_rcp_cmd
-  put = 'let g:netrw_rsync_cmd         = '.g:netrw_rsync_cmd
-  put = 'let g:netrw_scp_cmd           = '.g:netrw_scp_cmd
-  put = 'let g:netrw_sftp_cmd          = '.g:netrw_sftp_cmd
-  let s:netrw_protocol_stop= line(".")
-  put = ''
-
-  put ='+Netrw Transfer Control'
-  put = 'let g:netrw_cygwin            = '.g:netrw_cygwin
-  put = 'let g:netrw_ftp               = '.g:netrw_ftp
-  put = 'let g:netrw_ftpmode           = '.g:netrw_ftpmode
-  put = 'let g:netrw_ignorenetrc       = '.g:netrw_ignorenetrc
-  put = 'let g:netrw_use_nt_rcp        = '.g:netrw_use_nt_rcp
-  put = 'let g:netrw_win95ftp          = '.g:netrw_win95ftp
-  let s:netrw_xfer_stop= line(".")
-
-  put = ''
-  put ='+ Netrw Browser Control'
-  put = 'let g:netrw_alto              = '.g:netrw_alto
-  put = 'let g:netrw_altv              = '.g:netrw_altv
-  put = 'let g:netrw_dirhistmax        = '.g:netrw_dirhistmax
-  put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
-  put = 'let g:netrw_ftp_list_cmd      = '.g:netrw_ftp_list_cmd
-  put = 'let g:netrw_hide              = '.g:netrw_hide
-  put = 'let g:netrw_keepdir           = '.g:netrw_keepdir
-  put = 'let g:netrw_list_cmd          = '.g:netrw_list_cmd
-  put = 'let g:netrw_list_cmd          = '.g:netrw_list_cmd
-  put = 'let g:netrw_list_hide         = '.g:netrw_list_hide
-  put = 'let g:netrw_local_mkdir       = '.g:netrw_local_mkdir
-  put = 'let g:netrw_local_rmdir       = '.g:netrw_local_rmdir
-  put = 'let g:netrw_longlist          = '.g:netrw_longlist
-  put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
-  put = 'let g:netrw_mkdir_cmd         = '.g:netrw_mkdir_cmd
-  put = 'let g:netrw_rename_cmd        = '.g:netrw_rename_cmd
-  put = 'let g:netrw_rm_cmd            = '.g:netrw_rm_cmd
-  put = 'let g:netrw_rmdir_cmd         = '.g:netrw_rmdir_cmd
-  put = 'let g:netrw_rmf_cmd           = '.g:netrw_rmf_cmd
-  put = 'let g:netrw_silent            = '.g:netrw_silent
-  put = 'let g:netrw_sort_by           = '.g:netrw_sort_by
-  put = 'let g:netrw_sort_direction    = '.g:netrw_sort_direction
-  put = 'let g:netrw_sort_sequence     = '.g:netrw_sort_sequence
-  put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
-  put = 'let g:netrw_timefmt           = '.g:netrw_timefmt
-  put = 'let g:netrw_winsize           = '.g:netrw_winsize
-
-  put =''
-  put ='+ For help, place cursor on line and press ?'
-
-  1d
-  silent %s/^+/"/e
-  res 99
-  silent %s/= \([^0-9].*\)$/= '\1'/e
-  silent %s/= $/= ''/e
-  1
-
-  set nomod
-
-  map <buffer> <silent> ? :call NetrwSettingHelp()<cr>
-  let tmpfile= tempname()
-  exe 'au BufWriteCmd	Netrw\ Settings	silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod'
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwSettingHelp: {{{2
-fun! NetrwSettingHelp()
-"  call Dfunc("NetrwSettingHelp()")
-  let curline = getline(".")
-  if curline =~ '='
-   let varhelp = substitute(curline,'^\s*let ','','e')
-   let varhelp = substitute(varhelp,'\s*=.*$','','e')
-"   call Decho("trying help ".varhelp)
-   try
-    exe "he ".varhelp
-   catch /^Vim\%((\a\+)\)\=:E149/
-   	echo "***sorry*** no help available for <".varhelp.">"
-   endtry
-  elseif line(".") < s:netrw_settings_stop
-   he netrw-settings
-  elseif line(".") < s:netrw_protocol_stop
-   he netrw-externapp
-  elseif line(".") < s:netrw_xfer_stop
-   he netrw-variables
-  else
-   he netrw-browse-var
-  endif
-"  call Dret("NetrwSettingHelp")
-endfun
-
-" ---------------------------------------------------------------------
-" Modelines: {{{1
-" vim:ts=8 fdm=marker
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index ac3a2b257..378fe92b2 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1697,8 +1697,8 @@ write_viminfo(file, forceit)
 	 */
 	st_old.st_dev = st_old.st_ino = 0;
 	st_old.st_mode = 0600;
-	if (mch_stat((char *)fname, &st_old) == 0 && getuid() &&
-		!(st_old.st_uid == getuid()
+	if (mch_stat((char *)fname, &st_old) == 0 && getuid()
+		&& !(st_old.st_uid == getuid()
 			? (st_old.st_mode & 0200)
 			: (st_old.st_gid == getgid()
 				? (st_old.st_mode & 0020)
@@ -1762,8 +1762,8 @@ write_viminfo(file, forceit)
 		 * link, or file name-length reached.  Try again with
 		 * shortname set.
 		 */
-		if (!shortname && st_new.st_dev == st_old.st_dev &&
-			st_new.st_ino == st_old.st_ino)
+		if (!shortname && st_new.st_dev == st_old.st_dev
+					    && st_new.st_ino == st_old.st_ino)
 		{
 		    vim_free(tempname);
 		    tempname = NULL;
@@ -1806,7 +1806,12 @@ write_viminfo(file, forceit)
 	     * protection same as original file, but strip s-bit. */
 	    fd = mch_open((char *)tempname,
 		    O_CREAT|O_EXTRA|O_EXCL|O_WRONLY|O_NOFOLLOW,
-				       (int)((st_old.st_mode & 0777) | 0600));
+#ifdef UNIX
+				       (int)((st_old.st_mode & 0777) | 0600)
+#else
+				       0600	/* r&w for user only */
+#endif
+				       );
 	    if (fd < 0)
 		fp_out = NULL;
 	    else