updated for version 7.2-000
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg
index c63c031..3836284 100644
--- a/src/GvimExt/GvimExt.reg
+++ b/src/GvimExt/GvimExt.reg
@@ -15,6 +15,6 @@
[HKEY_LOCAL_MACHINE\Software\Vim\Gvim]
"path"="gvim.exe"
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.2c]
- "DisplayName"="Vim 7.2c: Edit with Vim popup menu entry"
+[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.2]
+ "DisplayName"="Vim 7.2: Edit with Vim popup menu entry"
"UninstallString"="uninstal.exe"
diff --git a/src/INSTALLx.txt b/src/INSTALLx.txt
index 0ba6a77..b3e9122 100644
--- a/src/INSTALLx.txt
+++ b/src/INSTALLx.txt
@@ -1,3 +1,5 @@
+INSTALLx.txt - cross-compiling Vim on Unix
+
Content:
1. Introduction
2. Necessary arguments for "configure"
diff --git a/src/Makefile b/src/Makefile
index 7fe7690..e27a6ce 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -901,7 +901,7 @@
### Vim version (adjusted by a script)
VIMMAJOR = 7
-VIMMINOR = 2c
+VIMMINOR = 2
### Location of Vim files (should not need to be changed, and {{{1
### some things might not work when they are changed!)
diff --git a/src/gui_mac.c b/src/gui_mac.c
index 77cd5ca..d54c110 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -62,6 +62,7 @@
static int im_is_active = FALSE;
#if 0
+ /* TODO: Implement me! */
static int im_start_row = 0;
static int im_start_col = 0;
#endif
diff --git a/src/gvim.exe.mnf b/src/gvim.exe.mnf
index 6b2424e..21f1c2e 100644
--- a/src/gvim.exe.mnf
+++ b/src/gvim.exe.mnf
@@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
processorArchitecture="*"
- version="7.1.0.0"
+ version="7.2.0.0"
type="win32"
name="Vim"
/>
@@ -19,4 +19,14 @@
/>
</dependentAssembly>
</dependency>
+ <!-- Vista security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
</assembly>
diff --git a/src/mark.c b/src/mark.c
index 7428969..2adf098 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -907,7 +907,10 @@
msg_putchar('\n');
if (got_int)
+ {
+ vim_free(name);
break;
+ }
sprintf((char *)IObuff, "%c %2d %5ld %4d ",
i == curwin->w_jumplistidx ? '>' : ' ',
i > curwin->w_jumplistidx ? i - curwin->w_jumplistidx
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 28f2f08..b2eee92 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1728,8 +1728,15 @@
return colorref;
}
+/* Attempt to make this work for old and new compilers */
+#if _MSC_VER < 1300
+# define PDP_RETVAL BOOL
+#else
+# define PDP_RETVAL INT_PTR
+#endif
+
/*ARGSUSED*/
- static BOOL CALLBACK
+ static PDP_RETVAL CALLBACK
PrintDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
#ifdef FEAT_GETTEXT
diff --git a/src/syntax.c b/src/syntax.c
index 5ec86c7..4b4b0bb 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2619,7 +2619,9 @@
break;
maxpos.lnum = 0;
+ maxpos.col = 0;
maxpos_h.lnum = 0;
+ maxpos_h.col = 0;
for ( ; i < current_state.ga_len; ++i)
{
sip = &CUR_STATE(i);
diff --git a/src/version.c b/src/version.c
index 61adb88..21d7b14 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,12 +677,6 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
- 3,
-/**/
- 2,
-/**/
- 1,
-/**/
0
};
diff --git a/src/version.h b/src/version.h
index d01abe0..d4f1344 100644
--- a/src/version.h
+++ b/src/version.h
@@ -19,13 +19,13 @@
#define VIM_VERSION_MINOR_STR "2"
#define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR)
-#define VIM_VERSION_BUILD 268
-#define VIM_VERSION_BUILD_BCD 0x10c
-#define VIM_VERSION_BUILD_STR "268"
+#define VIM_VERSION_BUILD 269
+#define VIM_VERSION_BUILD_BCD 0x10d
+#define VIM_VERSION_BUILD_STR "269"
#define VIM_VERSION_PATCHLEVEL 0
#define VIM_VERSION_PATCHLEVEL_STR "0"
/* Used by MacOS port should be one of: development, alpha, beta, final */
-#define VIM_VERSION_RELEASE beta
+#define VIM_VERSION_RELEASE final
/*
* VIM_VERSION_NODOT is used for the runtime directory name.
@@ -33,8 +33,8 @@
* VIM_VERSION_MEDIUM is used for the startup-screen.
* VIM_VERSION_LONG is used for the ":version" command and "Vim -h".
*/
-#define VIM_VERSION_NODOT "vim72c"
-#define VIM_VERSION_SHORT "7.2c"
-#define VIM_VERSION_MEDIUM "7.2c BETA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.2c BETA (2008 Aug 6)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.2c BETA (2008 Aug 6, compiled "
+#define VIM_VERSION_NODOT "vim72"
+#define VIM_VERSION_SHORT "7.2"
+#define VIM_VERSION_MEDIUM "7.2"
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.2 (2008 Aug 9)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.2 (2008 Aug 9, compiled "
diff --git a/src/vim.def b/src/vim.def
index f44552f..577569b 100644
--- a/src/vim.def
+++ b/src/vim.def
@@ -1,4 +1,4 @@
CODE PRELOAD EXECUTEONLY
DATA MULTIPLE SHARED
-DESCRIPTION 'Vim 7.2c'
+DESCRIPTION 'Vim 7.2'
HEAPSIZE 0,0
diff --git a/src/vim.h b/src/vim.h
index 87a80b8..b1a088d 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -177,6 +177,9 @@
# ifdef FEAT_X11
# undef FEAT_X11
# endif
+# ifdef FEAT_GUI_X11
+# undef FEAT_GUI_X11
+# endif
# ifdef FEAT_XCLIPBOARD
# undef FEAT_XCLIPBOARD
# endif
@@ -2014,8 +2017,9 @@
# ifdef instr
# undef instr
# endif
- /* bool causes trouble on MACOS but is required on a few other systems */
-# if defined(bool) && defined(MACOS)
+ /* bool may cause trouble on MACOS but is required on a few other systems
+ * and for Perl */
+# if defined(bool) && defined(MACOS) && !defined(FEAT_PERL)
# undef bool
# endif
diff --git a/src/vim16.def b/src/vim16.def
index db12144..7b41551 100644
--- a/src/vim16.def
+++ b/src/vim16.def
@@ -1,5 +1,5 @@
CODE PRELOAD EXECUTEONLY
DATA MULTIPLE SHARED
-DESCRIPTION 'Vim 7.2c'
+DESCRIPTION 'Vim 7.2'
STACKSIZE 16000
HEAPSIZE 10000