r735 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.043 upstream/patches/7.0.044 upstream/patches/7.0.045
upstream/patches/7.0.046
active2-guest at users.alioth.debian.org
active2-guest at users.alioth.debian.org
Tue Aug 8 16:37:08 UTC 2006
Author: active2-guest
Date: Tue Aug 8 16:37:06 2006
New Revision: 735
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=735
Log:
* Added patches from upstream.
Added:
trunk/packages/vim/upstream/patches/7.0.043
trunk/packages/vim/upstream/patches/7.0.044
trunk/packages/vim/upstream/patches/7.0.045
trunk/packages/vim/upstream/patches/7.0.046
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=735&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Aug 8 16:37:06 2006
@@ -67,3 +67,7 @@
1946 7.0.040 mouse selection with "z=" and inputlist() gets wrong entry
2229 7.0.041 cursor([1, 2]) failed, required third item in the list
1603 7.0.042 crash or hang when pasting a block in Insert mode
+ 1534 7.0.043 "%!" at start of 'statusline' didn't work
+ 5277 7.0.044 Perl: changing a line in a non-current buffer may not work
+ 1741 7.0.045 (extra) Win32: MSVC 2005 compiler warnings for OLE version
+ 2318 7.0.046 the matchparen plugin didn't handle parens in single quotes
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=735&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Aug 8 16:37:06 2006
@@ -1,14 +1,14 @@
vim (1:7.0-042+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (036 - 042), see README.gz for details.
+ * New upstream patches (036 - 046), 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)
- -- James Vega <jamessan at debian.org> Sun, 23 Jul 2006 23:58:08 -0400
+ -- Matthijs Mohlmann <matthijs at cacholong.nl> Tue, 8 Aug 2006 18:36:35 +0200
vim (1:7.0-035+1) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.0.043
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.043?rev=735&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.043 (added)
+++ trunk/packages/vim/upstream/patches/7.0.043 Tue Aug 8 16:37:06 2006
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.043
+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.043
+Problem: Using "%!" at the start of 'statusline' doesn't work.
+Solution: Recognize the special item when the option is being set.
+Files: src/option.c
+
+
+*** ../vim-7.0.042/src/option.c Sat May 13 14:41:15 2006
+--- src/option.c Mon Jul 10 22:41:20 2006
+***************
+*** 6325,6331 ****
+ else
+ errmsg = check_stl_option(p_ruf);
+ }
+! else
+ errmsg = check_stl_option(s);
+ if (varp == &p_ruf && errmsg == NULL)
+ comp_col();
+--- 6325,6332 ----
+ else
+ errmsg = check_stl_option(p_ruf);
+ }
+! /* check 'statusline' only if it doesn't start with "%!" */
+! else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
+ errmsg = check_stl_option(s);
+ if (varp == &p_ruf && errmsg == NULL)
+ comp_col();
+*** ../vim-7.0.042/src/version.c Sun Jul 23 22:37:29 2006
+--- src/version.c Tue Aug 8 16:29:24 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 43,
+ /**/
+
+--
+There's no place like $(HOME)!
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.0.044
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.044?rev=735&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.044 (added)
+++ trunk/packages/vim/upstream/patches/7.0.044 Tue Aug 8 16:37:06 2006
@@ -1,0 +1,211 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.044
+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.044
+Problem: Perl: setting a buffer line in another buffer may result in
+ changing the current buffer.
+Solution: Properly change to the buffer to be changed.
+Files: src/if_perl.xs
+
+
+*** ../vim-7.0.043/src/if_perl.xs Tue Mar 7 00:18:16 2006
+--- src/if_perl.xs Thu Jun 22 21:22:18 2006
+***************
+*** 1056,1062 ****
+ int i;
+ long lnum;
+ char *line;
+- buf_T *savebuf;
+ PPCODE:
+ if (buf_valid(vimbuf))
+ {
+--- 1056,1061 ----
+***************
+*** 1069,1082 ****
+ line = SvPV(ST(i),PL_na);
+ if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
+ {
+! savebuf = curbuf;
+ curbuf = vimbuf;
+ if (u_savesub(lnum) == OK)
+ {
+ ml_replace(lnum, (char_u *)line, TRUE);
+ changed_bytes(lnum, 0);
+ }
+! curbuf = savebuf;
+ }
+ }
+ }
+--- 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
+ }
+ }
+ }
+***************
+*** 1087,1093 ****
+
+ PREINIT:
+ long i, lnum = 0, count = 0;
+- buf_T *savebuf;
+ PPCODE:
+ if (buf_valid(vimbuf))
+ {
+--- 1103,1108 ----
+***************
+*** 1114,1129 ****
+ {
+ if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
+ {
+! savebuf = curbuf;
+ curbuf = vimbuf;
+ if (u_savedel(lnum, 1) == OK)
+ {
+ ml_delete(lnum, 0);
+ deleted_lines_mark(lnum, 1L);
+! if (savebuf == curbuf)
+ check_cursor();
+ }
+! curbuf = savebuf;
+ update_curbuf(VALID);
+ }
+ }
+--- 1129,1159 ----
+ {
+ 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);
+ deleted_lines_mark(lnum, 1L);
+! 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);
+ }
+ }
+***************
+*** 1138,1144 ****
+ int i;
+ long lnum;
+ char *line;
+- buf_T *savebuf;
+ PPCODE:
+ if (buf_valid(vimbuf))
+ {
+--- 1168,1173 ----
+***************
+*** 1151,1164 ****
+ line = SvPV(ST(i),PL_na);
+ if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
+ {
+! savebuf = curbuf;
+ curbuf = vimbuf;
+ if (u_inssub(lnum + 1) == OK)
+ {
+ ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
+ appended_lines_mark(lnum, 1L);
+ }
+! curbuf = savebuf;
+ 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);
+ }
+ }
+*** ../vim-7.0.043/src/version.c Tue Aug 8 16:30:51 2006
+--- src/version.c Tue Aug 8 16:45:40 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 44,
+ /**/
+
+--
+Momento mori, ergo carpe diem
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.0.045
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.045?rev=735&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.045 (added)
+++ trunk/packages/vim/upstream/patches/7.0.045 Tue Aug 8 16:37:06 2006
@@ -1,0 +1,67 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.045 (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 7.0.045 (extra)
+Problem: Win32: Warnings when compiling OLE version with MSVC 2005.
+Solution: Move including vim.h to before windows.h. (Ilya Bobir)
+Files: src/if_ole.cpp
+
+
+*** ../vim-7.0.044/src/if_ole.cpp Wed May 3 23:18:50 2006
+--- src/if_ole.cpp Sat Jun 24 13:36:52 2006
+***************
+*** 13,23 ****
+ * See os_mswin.c for the client side.
+ */
+
+ #include <windows.h>
+ #include <oleauto.h>
+
+ extern "C" {
+- #include "vim.h"
+ extern HWND s_hwnd;
+ extern HWND vim_parent_hwnd;
+ }
+--- 13,26 ----
+ * See os_mswin.c for the client side.
+ */
+
++ extern "C" {
++ #include "vim.h"
++ }
++
+ #include <windows.h>
+ #include <oleauto.h>
+
+ extern "C" {
+ extern HWND s_hwnd;
+ extern HWND vim_parent_hwnd;
+ }
+*** ../vim-7.0.044/src/version.c Tue Aug 8 16:47:38 2006
+--- src/version.c Tue Aug 8 17:04:14 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 45,
+ /**/
+
+--
+From "know your smileys":
+ % Bike accident. A bit far-fetched, I suppose; although...
+ o _ _ _
+ _o /\_ _ \\o (_)\__/o (_)
+ _< \_ _>(_) (_)/<_ \_| \ _|/' \/
+ (_)>(_) (_) (_) (_) (_)' _\o_
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.0.046
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.046?rev=735&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.046 (added)
+++ trunk/packages/vim/upstream/patches/7.0.046 Tue Aug 8 16:37:06 2006
@@ -1,0 +1,68 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.046
+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.046
+Problem: The matchparen plugin ignores parens in strings, but not in single
+ quotes, often marked with "character".
+Solution: Also ignore parens in syntax items matching "character".
+Files: runtime/plugin/matchparen.vim
+
+
+*** ../vim-7.0.045/runtime/plugin/matchparen.vim Sat May 13 14:52:02 2006
+--- runtime/plugin/matchparen.vim Mon Jun 26 10:53:35 2006
+***************
+*** 1,6 ****
+ " Vim plugin for showing matching parens
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 May 11
+
+ " Exit quickly when:
+ " - this plugin was already loaded (or disabled)
+--- 1,6 ----
+ " Vim plugin for showing matching parens
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Jun 26
+
+ " Exit quickly when:
+ " - this plugin was already loaded (or disabled)
+***************
+*** 96,102 ****
+
+ " When not in a string or comment ignore matches inside them.
+ let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
+! \ '=~? "string\\|comment"'
+ execute 'if' s_skip '| let s_skip = 0 | endif'
+
+ let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
+--- 96,102 ----
+
+ " When not in a string or comment ignore matches inside them.
+ let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
+! \ '=~? "string\\|character\\|singlequote\\|comment"'
+ execute 'if' s_skip '| let s_skip = 0 | endif'
+
+ let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
+*** ../vim-7.0.045/src/version.c Tue Aug 8 17:06:21 2006
+--- src/version.c Tue Aug 8 18:07:37 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 46,
+ /**/
+
+--
+I AM THANKFUL...
+...for the taxes that I pay because it means that I am employed.
+
+ /// 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