r737 - in /trunk/packages/vim: debian/README debian/changelog
patches/scripts.vim.diff upstream/patches/7.0.051
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Sat Aug 12 14:23:36 UTC 2006
Author: jamessan
Date: Sat Aug 12 14:23:35 2006
New Revision: 737
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=737
Log:
Add upstream patch 51 and update the scripts.vim.diff to recognize rest2web files as the rst filetype
Added:
trunk/packages/vim/upstream/patches/7.0.051
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/scripts.vim.diff
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=737&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Aug 12 14:23:35 2006
@@ -75,3 +75,4 @@
2173 7.0.048 the gzip plugin can't handle file names that have a paren
2221 7.0.049 some Tcl scripts are not recognized
1437 7.0.050 can't properly close a buffer through the NetBeans interface
+ 6097 7.0.051 (after 7.0.44) compile and/or run problem with Perl interface
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=737&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Aug 12 14:23:35 2006
@@ -1,14 +1,16 @@
-vim (1:7.0-050+1) UNRELEASED; urgency=low
+vim (1:7.0-051+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (036 - 050), see README.gz for details.
+ * New upstream patches (036 - 051), see README.gz for details.
[ James Vega ]
* Add patches/de.po.diff, which differentiates between "Delete" and
"Readonly" swap recovery messages for the German translation.
(closes: #379507)
-
- -- Norbert Tretkowski <nobse at debian.org> Wed, 9 Aug 2006 10:06:25 +0200
+ * Update patches/scripts.vim.diff to add recognition of rest2web files as
+ the filetype 'rst'. (closes: #382541)
+
+ -- James Vega <jamessan at debian.org> Sat, 12 Aug 2006 01:34:23 -0400
vim (1:7.0-035+1) unstable; urgency=low
Modified: trunk/packages/vim/patches/scripts.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/scripts.vim.diff?rev=737&op=diff
==============================================================================
--- trunk/packages/vim/patches/scripts.vim.diff (original)
+++ trunk/packages/vim/patches/scripts.vim.diff Sat Aug 12 14:23:35 2006
@@ -2,7 +2,7 @@
===================================================================
--- vim/runtime/scripts.vim.orig
+++ vim/runtime/scripts.vim
-@@ -265,7 +265,7 @@
+@@ -271,7 +271,7 @@
set ft=virata
" Strace
@@ -11,3 +11,18 @@
set ft=strace
" VSE JCL
+@@ -309,6 +309,14 @@
+ elseif s:line1 =~ 'exec\s\+\S*scheme' || s:line2 =~ 'exec\s\+\S*scheme'
+ set ft=scheme
+
++ " rest2web
++ elseif s:line1 =~ '^rest2web\>'
++ \ || s:line2 =~ '^rest2web\>'
++ \ || s:line3 =~ '^rest2web\>'
++ \ || s:line4 =~ '^rest2web\>'
++ \ || s:line5 =~ '^rest2web\>'
++ set ft=rst
++
+ " CVS diff
+ else
+ let lnum = 1
Added: trunk/packages/vim/upstream/patches/7.0.051
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.051?rev=737&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.051 (added)
+++ trunk/packages/vim/upstream/patches/7.0.051 Sat Aug 12 14:23:35 2006
@@ -1,0 +1,227 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.051
+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 7.0.051 (after 7.0.44)
+Problem: The Perl interface doesn't compile or doesn't work properly.
+Solution: Remove the spaces before #ifdef and avoid an empty line above it.
+Files: src/if_perl.xs
+
+
+*** ../vim-7.0.050/src/if_perl.xs Tue Aug 8 16:47:38 2006
+--- src/if_perl.xs Fri Aug 11 22:51:01 2006
+***************
+*** 1068,1098 ****
+ line = SvPV(ST(i),PL_na);
+ if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
+ {
+! #ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+
+ /* set curwin/curbuf for "vimbuf" and save some things */
+ aucmd_prepbuf(&aco, vimbuf);
+! #else
+ buf_T *save_curbuf = curbuf;
+
+ curbuf = vimbuf;
+ curwin->w_buffer = vimbuf;
+! #endif
+ if (u_savesub(lnum) == OK)
+ {
+ ml_replace(lnum, (char_u *)line, TRUE);
+ changed_bytes(lnum, 0);
+ }
+!
+! #ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "vimbuf" invalid! */
+! #else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+! #endif
+ }
+ }
+ }
+--- 1068,1097 ----
+ line = SvPV(ST(i),PL_na);
+ if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
+ {
+! #ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+
+ /* set curwin/curbuf for "vimbuf" and save some things */
+ aucmd_prepbuf(&aco, vimbuf);
+! #else
+ buf_T *save_curbuf = curbuf;
+
+ curbuf = vimbuf;
+ curwin->w_buffer = vimbuf;
+! #endif
+ if (u_savesub(lnum) == OK)
+ {
+ ml_replace(lnum, (char_u *)line, TRUE);
+ changed_bytes(lnum, 0);
+ }
+! #ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "vimbuf" invalid! */
+! #else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+! #endif
+ }
+ }
+ }
+***************
+*** 1130,1144 ****
+ if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
+ {
+ buf_T *save_curbuf = curbuf;
+! #ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+
+ /* set curwin/curbuf for "vimbuf" and save some things */
+ aucmd_prepbuf(&aco, vimbuf);
+! #else
+ curbuf = vimbuf;
+ curwin->w_buffer = vimbuf;
+! #endif
+ if (u_savedel(lnum, 1) == OK)
+ {
+ ml_delete(lnum, 0);
+--- 1129,1143 ----
+ if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
+ {
+ buf_T *save_curbuf = curbuf;
+! #ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+
+ /* set curwin/curbuf for "vimbuf" and save some things */
+ aucmd_prepbuf(&aco, vimbuf);
+! #else
+ curbuf = vimbuf;
+ curwin->w_buffer = vimbuf;
+! #endif
+ if (u_savedel(lnum, 1) == OK)
+ {
+ ml_delete(lnum, 0);
+***************
+*** 1146,1159 ****
+ if (save_curbuf == curbuf)
+ check_cursor();
+ }
+! #ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "vimbuf" invalid! */
+! #else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+! #endif
+ update_curbuf(VALID);
+ }
+ }
+--- 1145,1158 ----
+ if (save_curbuf == curbuf)
+ check_cursor();
+ }
+! #ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "vimbuf" invalid! */
+! #else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+! #endif
+ update_curbuf(VALID);
+ }
+ }
+***************
+*** 1180,1210 ****
+ line = SvPV(ST(i),PL_na);
+ if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
+ {
+! #ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+
+ /* set curwin/curbuf for "vimbuf" and save some things */
+ aucmd_prepbuf(&aco, vimbuf);
+! #else
+ buf_T *save_curbuf = curbuf;
+
+ curbuf = vimbuf;
+ curwin->w_buffer = vimbuf;
+! #endif
+ if (u_inssub(lnum + 1) == OK)
+ {
+ ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
+ appended_lines_mark(lnum, 1L);
+ }
+!
+! #ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "vimbuf" invalid! */
+! #else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+! #endif
+ update_curbuf(VALID);
+ }
+ }
+--- 1179,1208 ----
+ line = SvPV(ST(i),PL_na);
+ if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
+ {
+! #ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+
+ /* set curwin/curbuf for "vimbuf" and save some things */
+ aucmd_prepbuf(&aco, vimbuf);
+! #else
+ buf_T *save_curbuf = curbuf;
+
+ curbuf = vimbuf;
+ curwin->w_buffer = vimbuf;
+! #endif
+ if (u_inssub(lnum + 1) == OK)
+ {
+ ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
+ appended_lines_mark(lnum, 1L);
+ }
+! #ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "vimbuf" invalid! */
+! #else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+! #endif
+ update_curbuf(VALID);
+ }
+ }
+*** ../vim-7.0.050/src/version.c Tue Aug 8 21:36:15 2006
+--- src/version.c Fri Aug 11 22:55:25 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 51,
+ /**/
+
+--
+"A clear conscience is usually the sign of a bad memory."
+ -- Steven Wright
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
More information about the pkg-vim-maintainers
mailing list