diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index 3b4bb54b52e12d52836241c9f00003cfbfdf6364..567ecf10838e6b36a4f8868f92a2a4d3abdf4235 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,9 +1,9 @@
-*tar.txt*	Tar File Interface				Nov 22, 2005
+*tar.txt*	Tar File Interface				Dec 21, 2005
 
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
 Copyright: The GPL (gnu public license) applies to	*tar-copyright*
-	   tarPlugin.vim, and tar.txt.
+	   tarPlugin.vim, and pi_tar.txt.
 	   No warranty, express or implied.  Use At-Your-Own-Risk.
 
 ==============================================================================
@@ -23,6 +23,8 @@ Copyright: The GPL (gnu public license) applies to	*tar-copyright*
 
 ==============================================================================
 3. History						*tar-history*
+   v6 Dec 21, 2005 * writing to files not in directories caused problems -
+                     fixed (pointed out by Christian Robinson)
    v5 Nov 22, 2005 * report option workaround installed
    v3 Sep 16, 2005 * handles writing files in an archive back to the
                      archive
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 1358a11b2475fc274d118e409b09cdc6439c4d21..f9786d3ac919ad6d1aacf2a915622fc1ce12d3fb 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,4 +1,4 @@
-*zip.txt*	Zip File Interface				Nov 22, 2005
+*zip.txt*	Zip File Interface				Nov 28, 2005
 
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
@@ -6,10 +6,11 @@ Copyright:    Copyright (C) 2005 Charles E. Campbell, Jr. {{{1 *zip-copyright*
               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,
-	      zip.vim and zipPlugin.vim are 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.
+	      zip.vim, zipPlugin.vim, and pi_zip.txt are provided *as is*
+	      and it 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.
 
 ==============================================================================
 1. Contents					*zip* *zip-contents*
@@ -28,6 +29,8 @@ Copyright:    Copyright (C) 2005 Charles E. Campbell, Jr. {{{1 *zip-copyright*
 
 ==============================================================================
 3. History					*zip-history*
+   v6 Dec 21, 2005 * writing to files not in directories caused problems -
+                     fixed (pointed out by Christian Robinson)
    v5 Nov 22, 2005 * report option workaround installed
    v3 Oct 18, 2005 * <amatch> used instead of <afile> in autocmds
    v2 Sep 16, 2005 * silenced some commands (avoiding hit-enter prompt)
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 7615c59d6a6f9fa46f7deccc75400337f93a2e82..5aa1e4de8d9b95733da5ce9b0977fb6058291601 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Dr. Charles E. Campbell, Jr.  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Oct 18, 2005
-" Version:		78
+" Last Change:		Dec 29, 2005
+" Version:		79
 " URL:		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
 "
 " Using the following VIM variables: {{{1
@@ -123,7 +123,7 @@ syn match     shTestError "]"
 " Options Interceptor: {{{1
 " ====================
 syn match   shOption  "\s[\-+][a-zA-Z0-9]\+\>"ms=s+1
-syn match   shOption  "\s--\S\+"ms=s+1
+syn match   shOption  "\s--[^ \t$`|]\+"ms=s+1
 
 " Operators: {{{1
 " ==========
diff --git a/src/fileio.c b/src/fileio.c
index c21035ce124bf8d17f9a35e993e9a347b4cbf91e..e05fb54db8cb4249332c16ba1a6c9f4a1ff2231d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1491,7 +1491,7 @@ retry:
 			else
 			{
 			    u8c = utf_ptr2char(src);
-			    if (u8c > 0xffff)
+			    if (u8c > 0xffff || (*src >= 0x80 && bytelen == 1))
 				found_bad = TRUE;
 			    ucs2buf[0] = u8c;
 			    ucs2len = 1;