SOURCES: 6.3.079 (NEW), 6.3.080 (NEW) - new patches

arekm arekm at pld-linux.org
Tue Jul 5 23:08:04 CEST 2005


Author: arekm                        Date: Tue Jul  5 21:08:04 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new patches

---- Files affected:
SOURCES:
   6.3.079 (NONE -> 1.1)  (NEW), 6.3.080 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/6.3.079
diff -u /dev/null SOURCES/6.3.079:1.1
--- /dev/null	Tue Jul  5 23:08:04 2005
+++ SOURCES/6.3.079	Tue Jul  5 23:07:59 2005
@@ -0,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.079
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.079
+Problem:    Crash when executing a command in the command line window while 
+            syntax highlighting is enabled. (Pero Brbora)
+Solution:   Don't use a pointer to a buffer that has been deleted.
+Files:      src/syntax.c
+
+
+*** ../vim-6.3.078/src/syntax.c	Tue May 31 21:30:24 2005
+--- src/syntax.c	Fri Jul  1 11:12:05 2005
+***************
+*** 1158,1164 ****
+      prev = NULL;
+      for (p = buf->b_sst_first; p != NULL; )
+      {
+! 	if (p->sst_lnum + syn_buf->b_syn_sync_linebreaks > buf->b_mod_top)
+  	{
+  	    n = p->sst_lnum + buf->b_mod_xlines;
+  	    if (n <= buf->b_mod_bot)
+--- 1158,1164 ----
+      prev = NULL;
+      for (p = buf->b_sst_first; p != NULL; )
+      {
+! 	if (p->sst_lnum + buf->b_syn_sync_linebreaks > buf->b_mod_top)
+  	{
+  	    n = p->sst_lnum + buf->b_mod_xlines;
+  	    if (n <= buf->b_mod_bot)
+*** ../vim-6.3.078/src/version.c	Tue Jun 14 19:08:07 2005
+--- src/version.c	Fri Jul  1 11:20:27 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     79,
+  /**/
+
+-- 
+Some of the well know MS-Windows errors:
+	EMEMORY		Memory error caused by..., eh...
+	ELICENSE	Your license has expired, give us more money!
+	EMOUSE		Mouse moved, reinstall Windows
+	EILLEGAL	Illegal error, you are not allowed to see this
+	EVIRUS		Undetectable virus found
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

================================================================
Index: SOURCES/6.3.080
diff -u /dev/null SOURCES/6.3.080:1.1
--- /dev/null	Tue Jul  5 23:08:04 2005
+++ SOURCES/6.3.080	Tue Jul  5 23:07:59 2005
@@ -0,0 +1,114 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.080 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.080 (extra)
+Problem:    Win32: With 'encoding' set to utf-8 while the current codepage is
+	    Chinese editing a file with some specific characters in the name
+	    fails.
+Solution:   Use _wfullpath() instead of _fullpath() when necessary.
+Files:	    src/os_mswin.c
+
+
+*** ../vim-6.3.079/src/os_mswin.c	Sun Dec  5 16:43:06 2004
+--- src/os_mswin.c	Sat Jul  2 13:07:35 2005
+***************
+*** 367,385 ****
+  	nResult = mch_dirname(buf, len);
+      else
+  #endif
+- 	if (_fullpath(buf, fname, len - 1) == NULL)
+      {
+! 	STRNCPY(buf, fname, len);   /* failed, use the relative path name */
+! 	buf[len - 1] = NUL;
+! #ifndef USE_FNAME_CASE
+! 	slash_adjust(buf);
+  #endif
+      }
+-     else
+- 	nResult = OK;
+  
+  #ifdef USE_FNAME_CASE
+      fname_case(buf, len);
+  #endif
+  
+      return nResult;
+--- 367,421 ----
+  	nResult = mch_dirname(buf, len);
+      else
+  #endif
+      {
+! #ifdef FEAT_MBYTE
+! 	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage
+! # ifdef __BORLANDC__
+! 		/* Wide functions of Borland C 5.5 do not work on Windows 98. */
+! 		&& g_PlatformId == VER_PLATFORM_WIN32_NT
+! # endif
+! 	   )
+! 	{
+! 	    WCHAR	*wname;
+! 	    WCHAR	wbuf[MAX_PATH];
+! 	    char_u	*cname = NULL;
+! 
+! 	    /* Use the wide function:
+! 	     * - convert the fname from 'encoding' to UCS2.
+! 	     * - invoke _wfullpath()
+! 	     * - convert the result from UCS2 to 'encoding'.
+! 	     */
+! 	    wname = enc_to_ucs2(fname, NULL);
+! 	    if (wname != NULL && _wfullpath(wbuf, wname, MAX_PATH - 1) != NULL)
+! 	    {
+! 		cname = ucs2_to_enc((short_u *)wbuf, NULL);
+! 		if (cname != NULL)
+! 		{
+! 		    STRNCPY(buf, cname, len);
+! 		    buf[len - 1] = NUL;
+! 		    nResult = OK;
+! 		}
+! 	    }
+! 	    vim_free(wname);
+! 	    vim_free(cname);
+! 	}
+! 	if (nResult == FAIL)	    /* fall back to non-wide function */
+  #endif
++ 	{
++ 	    if (_fullpath(buf, fname, len - 1) == NULL)
++ 	    {
++ 		STRNCPY(buf, fname, len);   /* failed, use relative path name */
++ 		buf[len - 1] = NUL;
++ 	    }
++ 	    else
++ 		nResult = OK;
++ 	}
+      }
+  
+  #ifdef USE_FNAME_CASE
+      fname_case(buf, len);
++ #else
++     slash_adjust(buf);
+  #endif
+  
+      return nResult;
+*** ../vim-6.3.079/src/version.c	Fri Jul  1 11:20:39 2005
+--- src/version.c	Mon Jul  4 12:18:34 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     80,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+225. You sign up for free subscriptions for all the computer magazines
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
================================================================



More information about the pld-cvs-commit mailing list