r247 - in trunk/vim: debian debian/patches upstream/patches
Matthijs Mohlmann
active2-guest@costa.debian.org
Wed, 06 Jul 2005 20:50:28 +0000
Author: active2-guest
Date: 2005-07-06 20:50:27 +0000 (Wed, 06 Jul 2005)
New Revision: 247
Added:
trunk/vim/debian/patches/130_fstab.vim.diff
trunk/vim/debian/patches/131_xxd.1.diff
trunk/vim/upstream/patches/6.3.079
trunk/vim/upstream/patches/6.3.080
Modified:
trunk/vim/debian/README
trunk/vim/debian/changelog
Log:
* Added new upstream patches 079 and 080
* Added bind as option in the fstab highlighting
* Fixed 2 typos
Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README 2005-06-16 04:27:23 UTC (rev 246)
+++ trunk/vim/debian/README 2005-07-06 20:50:27 UTC (rev 247)
@@ -103,3 +103,5 @@
3546 6.3.076 crash when using Cscope interface with very long result
1934 6.3.077 (extra) VMS: character after ESC not handled correctly
2508 6.3.078 (extra, after 6.3.077) VMS: performance issue
+ 1853 6.3.079 crash after executing a command in the command-line window
+ 3024 6.3.080 (extra) Win32: edit fails when 'enc' is utf-8 and Chinese cp
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-06-16 04:27:23 UTC (rev 246)
+++ trunk/vim/debian/changelog 2005-07-06 20:50:27 UTC (rev 247)
@@ -1,10 +1,15 @@
-vim (1:6.3-078+2) UNRELEASED; urgency=low
+vim (1:6.3-080+1) UNRELEASED; urgency=low
+ * New upstream patches (079 and 080), see README.gz for details.
+
* James Vega <jamessan@jamessan.com>
+ Added patch 129_filetype.vim.diff, which sets the filetype to perl for
*.plx files. (closes: #314309)
+ * Matthijs Mohlmann <matthijs@cacholong.nl>
+ + Added patch 130_fstab.vim.diff, Added bind as option. (Closes: #308890)
+ + Added patch 131_xxd.1.diff, Fixes typo in xxd manpage. (Closes: #311234)
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> Thu, 16 Jun 2005 00:22:17 -0400
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> Wed, 6 Jul 2005 22:21:58 +0200
vim (1:6.3-078+1) unstable; urgency=low
Added: trunk/vim/debian/patches/130_fstab.vim.diff
===================================================================
--- trunk/vim/debian/patches/130_fstab.vim.diff 2005-06-16 04:27:23 UTC (rev 246)
+++ trunk/vim/debian/patches/130_fstab.vim.diff 2005-07-06 20:50:27 UTC (rev 247)
@@ -0,0 +1,12 @@
+diff -ruN vim63.orig/runtime/syntax/fstab.vim vim63/runtime/syntax/fstab.vim
+--- vim63.orig/runtime/syntax/fstab.vim 2005-07-06 17:04:27.329511848 +0200
++++ vim63/runtime/syntax/fstab.vim 2005-07-06 17:05:10.977876288 +0200
+@@ -44,7 +44,7 @@
+ syn keyword fsOptionsYesNo yes no
+ syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
+ syn keyword fsOptionsSize 512 1024 2048
+-syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode users
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode users
+ syn match fsOptionsGeneral /_netdev/
+
+ " Options: adfs
Added: trunk/vim/debian/patches/131_xxd.1.diff
===================================================================
--- trunk/vim/debian/patches/131_xxd.1.diff 2005-06-16 04:27:23 UTC (rev 246)
+++ trunk/vim/debian/patches/131_xxd.1.diff 2005-07-06 20:50:27 UTC (rev 247)
@@ -0,0 +1,21 @@
+diff -ruN vim63.orig/runtime/doc/xxd.1 vim63/runtime/doc/xxd.1
+--- vim63.orig/runtime/doc/xxd.1 2005-07-06 21:54:34.443228328 +0200
++++ vim63/runtime/doc/xxd.1 2005-07-06 21:55:22.503921992 +0200
+@@ -62,7 +62,7 @@
+ .IR \-b " | " \-bits
+ Switch to bits (binary digits) dump, rather than hexdump.
+ This option writes bytes as eight digits "1"s and "0"s instead of a normal
+-hexacecimal dump. Each line is preceded by a line number in hexadecimal and
++hexadecimal dump. Each line is preceded by a line number in hexadecimal and
+ followed by an ascii (or ebcdic) representation. The command line switches
+ \-r, \-p, \-i do not work with this mode.
+ .TP
+@@ -78,7 +78,7 @@
+ meaningless in combinations with \-r, \-p or \-i.
+ .TP
+ .IR "\-g bytes " | " \-groupsize bytes"
+-seperate the output of every
++separate the output of every
+ .RI < bytes >
+ bytes (two hex characters or eight bit-digits each) by a whitespace.
+ Specify
Added: trunk/vim/upstream/patches/6.3.079
===================================================================
--- trunk/vim/upstream/patches/6.3.079 2005-06-16 04:27:23 UTC (rev 246)
+++ trunk/vim/upstream/patches/6.3.079 2005-07-06 20:50:27 UTC (rev 247)
@@ -0,0 +1,57 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.079
+Fcc: outbox
+From: Bram Moolenaar <Bram@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@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 ///
Added: trunk/vim/upstream/patches/6.3.080
===================================================================
--- trunk/vim/upstream/patches/6.3.080 2005-06-16 04:27:23 UTC (rev 246)
+++ trunk/vim/upstream/patches/6.3.080 2005-07-06 20:50:27 UTC (rev 247)
@@ -0,0 +1,114 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.080 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@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@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 ///