diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index b7a5bff..687500e 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -1,10 +1,10 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Apr 17, 2013
-" Version:	26
+" Date:		Jul 02, 2013
+" Version:	27
 " Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
-" Copyright:    Copyright (C) 2005-2012 Charles E. Campbell {{{1
+" Copyright:    Copyright (C) 2005-2013 Charles E. Campbell {{{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,
@@ -13,13 +13,14 @@
 "               this plugin, you agree that in no event will the copyright
 "               holder be liable for any damages resulting from the use
 "               of this software.
+"redraw!|call DechoSep()|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 
 " ---------------------------------------------------------------------
 " Load Once: {{{1
 if &cp || exists("g:loaded_zip")
  finish
 endif
-let g:loaded_zip= "v26"
+let g:loaded_zip= "v27"
 if v:version < 702
  echohl WarningMsg
  echo "***warning*** this version of zip needs vim 7.2"
@@ -28,6 +29,7 @@
 endif
 let s:keepcpo= &cpo
 set cpo&vim
+"DechoTabOn
 
 let s:zipfile_escape = ' ?&;\'
 let s:ERROR          = 2
@@ -60,6 +62,16 @@
 " zip#Browse: {{{2
 fun! zip#Browse(zipfile)
 "  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
+  " sanity check: insure that the zipfile has "PK" as its first two letters
+  "               (zipped files have a leading PK as a "magic cookie")
+  if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
+   exe "noautocmd e ".fnameescape(a:zipfile)
+"   call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
+   return
+"  else        " Decho
+"   call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file")
+  endif
+
   let repkeep= &report
   set report=10
 
@@ -197,6 +209,7 @@
   "   exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1)
   " but allows zipfile:... entries in quickfix lists
   let temp = tempname()
+"  call Decho("using temp file<".temp.">")
   let fn   = expand('%:p')
   exe "sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1).' > '.temp
 "  call Decho("exe sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1).' > '.temp)
@@ -208,7 +221,7 @@
   filetype detect
 
   " cleanup
-  keepj 0d
+  "  keepj 0d   " used to be needed for the ...r! ... method
   set nomod
 
   let &report= repkeep
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index fc0edb3..b7d32ca 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.3.  Last change: 2013 Apr 12
+*insert.txt*    For Vim version 7.3.  Last change: 2013 Jul 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -136,6 +136,8 @@
 				too.
 				When the result is a Float it's automatically
 				converted to a String.
+				When append() or setline() is invoked the undo
+				sequence will be broken.
 		See |registers| about registers.  {not in Vi}
 
 CTRL-R CTRL-R {0-9a-z"%#*+/:.-=}			*i_CTRL-R_CTRL-R*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 16def1b..19c9316 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4292,6 +4292,7 @@
 E878	pattern.txt	/*E878*
 E879	syntax.txt	/*E879*
 E88	windows.txt	/*E88*
+E880	if_pyth.txt	/*E880*
 E89	message.txt	/*E89*
 E90	message.txt	/*E90*
 E91	options.txt	/*E91*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e7df05c..8952387 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2013 Jun 29
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Jul 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,46 +34,8 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
---- Python interface ---
-
-    Breaks the tests
-Problem:    Python SystemExit exception is not handled properly.
-Solution:   Catch the exception and give an error. (Yasuhiro Matsumoto)
-Files:	    runtime/doc/if_pyth.txt, src/if_py_both.h, src/if_python.c,
-	    src/if_python3.c
-
 Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
 
---- bug fixes ---
-
-9. Patch to fix "gn" on single character matches. (Christian Brabandt, 2013
-Jun 2)
-
-8. Patch for cscope connection (Narendran, 2013 Jun 10)
-
-7. 'cursorline' is drawn incorrectly in diff mode. Patch by Christian Brabandt,
-2012 Apr 2.
-
-6. When someone does a silly thing such as setting rows and columns to 65535,
-handle the out-of-memory and set them to sane values? (jimmywang, 2013 May 17)
-
-5. InsertEnter doesn't prevent the cursor from moving when it goes to another
-line.
-
-4. ":diffoff" does not restore options from before starting diff mode.
-Patch by Christian Brabandt, 2013 May 26.
-
-3. Can't use multi-byte fill character in custom status line.
-Patch by Christian Wellenbrock, 2013 Jun 2.  Update Jun 3 (second one).
-
-2. Patch to fix glob() and globpath() with escaped special characters.
-(Adnan Zafar, 2013 Jun 2, tests Jun 3)
-
-1. Bug in findfile() directory matching. (Markus Braun Ben Fritz, 2013 Jun 20)
-Patch by Christian Brabandt (2013 Jun 22)
-
----- Fixes to be included before 7.4 above, less important stuff below ----
-
 Patch to make has() check for Vim version and patch at the same time.
 (Marc Weber, 2013 Jun 7)
 
@@ -267,8 +229,6 @@
 - Use urxvt mouse support also in xterm.  Explanations:
   http://www.midnight-commander.org/ticket/2662
 
-MS-Windows: test 17 fails.  Analysis by Michael Soyka, 2012 Nov 5.
-
 Patch to add tests for if_xcmdsrv.c., Jul 8, need some more work. (Brian Burns)
 New tests Jul 13.   Update Jul 17.  Discussion Jul 18.
 
diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim
index c86230c..e9bd0dc 100644
--- a/runtime/plugin/zipPlugin.vim
+++ b/runtime/plugin/zipPlugin.vim
@@ -1,9 +1,9 @@
 " zipPlugin.vim: Handles browsing zipfiles
 "            PLUGIN PORTION
-" Date:			Nov 15, 2012
+" Date:			Jun 07, 2013
 " Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " License:		Vim License  (see vim's :help license)
-" Copyright:    Copyright (C) 2005-2012 Charles E. Campbell {{{1
+" Copyright:    Copyright (C) 2005-2013 Charles E. Campbell {{{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,
@@ -20,11 +20,17 @@
 if &cp || exists("g:loaded_zipPlugin")
  finish
 endif
-let g:loaded_zipPlugin = "v26"
+let g:loaded_zipPlugin = "v27"
 let s:keepcpo          = &cpo
 set cpo&vim
 
 " ---------------------------------------------------------------------
+" Options: {{{1
+if !exists("g:zipPlugin_ext")
+ let g:zipPlugin_ext= '*.zip,*.jar,*.xpi,*.ja,*.war,*.ear,*.celzip,*.oxt,*.kmz,*.wsz,*.xap,*.docx,*.docm,*.dotx,*.dotm,*.potx,*.potm,*.ppsx,*.ppsm,*.pptx,*.pptm,*.ppam,*.sldx,*.thmx,*.xlam,*.xlsx,*.xlsm,*.xlsb,*.xltx,*.xltm,*.xlam,*.crtx,*.vdw,*.glox,*.gcsx,*.gqsx'
+endif
+
+" ---------------------------------------------------------------------
 " Public Interface: {{{1
 augroup zip
  au!
@@ -40,7 +46,7 @@
   au FileWriteCmd zipfile:*/*	call zip#Write(expand("<amatch>"))
  endif
 
- au BufReadCmd   *.zip,*.jar,*.xpi,*.ja,*.war,*.ear,*.celzip,*.oxt,*.kmz,*.wsz,*.xap,*.docx,*.docm,*.dotx,*.dotm,*.potx,*.potm,*.ppsx,*.ppsm,*.pptx,*.pptm,*.ppam,*.sldx,*.thmx,*.xlam,*.xlsx,*.xlsm,*.xlsb,*.xltx,*.xltm,*.xlam,*.crtx,*.vdw,*.glox,*.gcsx,*.gqsx		call zip#Browse(expand("<amatch>"))
+ exe "au BufReadCmd ".g:zipPlugin_ext.' call zip#Browse(expand("<amatch>"))'
 augroup END
 
 " ---------------------------------------------------------------------
diff --git a/src/VisVim/README_VisVim.txt b/src/VisVim/README_VisVim.txt
index fbe4b8b..25b0fbd 100644
--- a/src/VisVim/README_VisVim.txt
+++ b/src/VisVim/README_VisVim.txt
@@ -282,7 +282,7 @@
   occasionally still seems to happen, but it's more stable now).
   (Vince Negri)
 - Added support for the new CTRL-\ CTRL-N command of Vim 5.4a.
-  This prevents Vim from beeping when a VisVim command is executed an Vim is
+  This prevents Vim from beeping when a VisVim command is executed and Vim is
   not in insert mode.
 
 
diff --git a/src/msvc2008.bat b/src/msvc2008.bat
index 1fc1fbf..c1cd76a 100644
--- a/src/msvc2008.bat
+++ b/src/msvc2008.bat
@@ -4,4 +4,4 @@
 rem See INSTALLpc.txt for information.
 @echo on
 
-call "%VS90COMNTOOLS%%vsvars32.bat"
+call "%VS90COMNTOOLS%vsvars32.bat"
diff --git a/src/msvc2010.bat b/src/msvc2010.bat
index d9fc6c0..5c258e9 100644
--- a/src/msvc2010.bat
+++ b/src/msvc2010.bat
@@ -4,4 +4,4 @@
 rem See INSTALLpc.txt for information.
 @echo on
 
-call "%VS100COMNTOOLS%%vsvars32.bat"
+call "%VS100COMNTOOLS%vsvars32.bat"
diff --git a/src/version.c b/src/version.c
index 1219092..5a200ae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1308,
+/**/
     1307,
 /**/
     1306,