diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt
index 8bb1b1c..2fd6d8b 100644
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
+*os_vms.txt*    For Vim version 7.0aa.  Last change: 2005 Jul 12
 
 
 		  VIM REFERENCE MANUAL
@@ -47,16 +47,19 @@
 
 To use the precompiled binary version, you need one of these archives:
 
-  vim-XX-exe-alpha-gui.zip      Alpha GUI/Motif executables
-  vim-XX-exe-alpha-gtk.zip      Alpha GUI/GTK executables
-  vim-XX-exe-alpha-term.zip     Alpha console executables
+  vim-XX-exe-ia64-gui.zip       IA64 GUI/Motif executables
+  vim-XX-exe-ia64-gtk.zip       IA64 GUI/GTK executables
+  vim-XX-exe-ia64-term.zip      IA64 console executables
+  vim-XX-exe-axp-gui.zip        Alpha GUI/Motif executables
+  vim-XX-exe-axp-gtk.zip        Alpha GUI/GTK executables
+  vim-XX-exe-axp-term.zip       Alpha console executables
   vim-XX-exe-vax-gui.zip	VAX GUI executables
   vim-XX-exe-vax-term.zip       VAX console executables
 
 and of course
   vim-XX-runtime.zip		runtime files
 
-The binary archives contain: vim.exe, ctags.exe, xxd.exe, mms_vim.exe files.
+The binary archives contain: vim.exe, ctags.exe, xxd.exe files.
 
 ==============================================================================
 
@@ -68,8 +71,8 @@
 
 4. Problems						*vms-problems*
 
-The code has been tested under Open VMS 6.2 - 7.3 on Alpha and VAX platforms
-with the DEC C compiler.  It should work without bigger problems.
+The code has been tested under Open VMS 6.2 - 8.2 on Alpha, VAX and IA64
+platforms with the DEC C compiler.  It should work without bigger problems.
 If your system does not have some include libraries you can tune up in
 OS_VMS_CONF.H file.
 
@@ -78,6 +81,8 @@
 libraries and change adequate lines in MAKE_VMS.MMS file.  There should not be
 a problem from Vim side.
 
+Also GTK, XPM library paths should be configured in MAKE_VMS.MMS
+
 Note: Under VAX it should work with the DEC C compiler without problems.  The
 VAX C compiler is not fully ANSI C compatible in pre-processor directives
 semantics, therefore you have to use a converter program what will do the lion
@@ -250,7 +255,7 @@
 
 Third: If you choose to run Vim with extra features such as GUI/GTK then you
 need a GTK installation too or at least a GTK runtime environment (LIBGTK
-etc.).
+can be downloaded from http://www.polarhome.com/vim/).
 
 1) If you are working on the VMS X/Motif console:
    Start Vim with the command: >
@@ -648,6 +653,17 @@
 
 9. VMS related changes					*vms-changes*
 
+Version 7.0
+- GTKLIB and Vim build on IA64
+- colors in terminal mode
+- syntax highlighting in terminal mode
+- write problem fixed (extra CR)
+- ESC and ESC sequence recognition in terminal mode
+- make file changed to support new MMS version
+- env variable expansion in path corrected
+- printing problems corrected
+- help text added for case insensitive arguments
+
 Version 6.3 (2004 May 10)
 - Improved vms_read function
 - CTAGS v5.5.4 included
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 4110bf8..7150c3b 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 06
+*quickref.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -848,6 +848,7 @@
 |'swapfile'|	  |'swf'|    whether to use a swapfile for a buffer
 |'swapsync'|	  |'sws'|    how to sync the swap file
 |'switchbuf'|	  |'swb'|    sets behavior when switching to another buffer
+|'synmaxcol'|	  |'smc'|    maximum column to find syntax items
 |'syntax'|	  |'syn'|    syntax to be loaded for current buffer
 |'tabstop'|	  |'ts'|     number of spaces that <Tab> in file uses
 |'tagbsearch'|	  |'tbs'|    use binary searching in tags files
diff --git a/src/INSTALLvms.txt b/src/INSTALLvms.txt
index f7df6a7..8e07c28 100644
--- a/src/INSTALLvms.txt
+++ b/src/INSTALLvms.txt
@@ -1,7 +1,7 @@
 INSTALLvms.txt - Installation of Vim on OpenVMS
 
-Maintainer:   Zoltan Arpadffy <arpadffy@polarfox.com>
-Last change:  2003 May 04
+Maintainer:   Zoltan Arpadffy <arpadffy@polarhome.com>
+Last change:  2005 Jul 12
 
 This file contains instructions for compiling Vim on Openvms.
 If you already have an executable version of Vim, you don't need this.
@@ -58,10 +58,11 @@
 NOTE: procedure in chapter 1 describes source code preparation from multi OS
 code,however it is available OpenVMS oprimized (and tested) source code from:
 ftp://ftp.polarhome.com/pub/vim/source/vms/
+(http://www.polarhome.com/vim/files/source/vms/)
 
 Current OpenVMS source code as .zip or .tar.gz file is possible to download
 from CVS mirror ftp://ftp.polarhome.com/pub/cvs/SOURCE/
-
+(http://www.polarhome.com/cvs/SOURCE/)
 
 2.   Configuration
 
@@ -99,6 +100,13 @@
 			  Uncommented - without GTK
 	Default		: Uncommented
 
+	Parameter name	: XPM
+	Description	: Enable XPM libraries in GUI/Motif mode.
+			  It enables features as toolbar etc.
+	Options:	: YES - GUI executable
+			  Uncommented - without XPM
+	Default		: Uncommented
+
 	Parameter name	: DECC
 	Description	: Compiler selection
 	Options:	: YES - DECC compiler
@@ -290,7 +298,7 @@
 7.2  GTK
 
      To build VIM with GTK you have to install GTK on your OpenVMS.
-     So far it works just on Alphas. More information at:
+     So far it works just on Alpha and IA64. More information at:
      http://www.openvms.compaq.com/openvms/products/ips/gtk.html
 
      You need also the OpenVMS Porting Library:
@@ -372,4 +380,4 @@
 
 9.   Authors
 
-     Initial version, 2000 Jul 19, Zoltan Arpadffy <arpadffy@polarfox.com>
+     Initial version, 2000 Jul 19, Zoltan Arpadffy <arpadffy@polarhome.com>
diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index e306ccb..d8b507d 100644
--- a/src/po/Make_cyg.mak
+++ b/src/po/Make_cyg.mak
@@ -13,26 +13,31 @@
 endif
 
 LANGUAGES =	af ca cs de en_GB es fr ga it ja ko no pl ru sk sv uk vi zh_TW \
-		cs.cp1250 ja.sjis pl.cp1250 ru.cp1251 sk.cp1250 uk.cp1251 \
-		zh_TW.UTF-8 zh_CN zh_CN.cp936 zh_CN.UTF-8
+		cs.cp1250 pl.cp1250 ru.cp1251 sk.cp1250 uk.cp1251 \
+		zh_TW.UTF-8 zh_CN zh_CN.cp936 zh_CN.UTF-8 ja.sjis
 MOFILES =	af.mo ca.mo cs.mo de.mo en_GB.mo es.mo fr.mo ga.mo it.mo ja.mo \
 		ko.mo no.mo pl.mo ru.mo sk.mo sv.mo uk.mo vi.mo \
-		cs.cp1250.mo ja.sjis.mo pl.cp1250.mo ru.cp1251.mo sk.cp1250.mo uk.cp1251.mo \
-		zh_TW.mo zh_TW.UTF-8.mo zh_CN.mo zh_CN.cp936.mo zh_CN.UTF-8.mo
+		cs.cp1250.mo pl.cp1250.mo ru.cp1251.mo sk.cp1250.mo uk.cp1251.mo \
+		zh_TW.mo zh_TW.UTF-8.mo zh_CN.mo zh_CN.cp936.mo zh_CN.UTF-8.mo \
+		ja.sjis.mo
 
 PACKAGE = vim
 
 # Uncomment one of the lines below or modify it to put the path to your
-# gettex binaries; I use the first
+# gettext binaries
 ifndef GETTEXT_PATH
 #GETTEXT_PATH = C:/gettext.win32/bin/
 #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
 GETTEXT_PATH = /bin/
 endif
 
-MSGFMT = $(GETTEXT_PATH)msgfmt
-XGETTEXT = $(GETTEXT_PATH)xgettext
-MSGMERGE = $(GETTEXT_PATH)msgmerge
+# The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
+# tools 0.10.37, which use a slightly different .po file format that is not
+# compatible with Solaris (and old gettext implementations) unless these are
+# set.  gettext 0.10.36 will not work!
+MSGFMT = OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v
+XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext
+MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge
 
 # MV = move
 # CP = copy
diff --git a/src/vim.h b/src/vim.h
index 20273b3..cdffd4a 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1894,11 +1894,11 @@
 # include <XSUB.h>
 #endif
 
-/* values for handle_signal() that are not a signal */
+/* values for vim_handle_signal() that are not a signal */
 #define SIGNAL_BLOCK	-1
 #define SIGNAL_UNBLOCK  -2
 #ifndef UNIX
-# define handle_signal(x) 0
+# define vim_handle_signal(x) 0
 #endif
 
 /* flags for skip_vimgrep_pat() */