r660 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.011 upstream/patches/7.0.012
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Thu May 11 17:47:18 UTC 2006
Author: jamessan
Date: Thu May 11 17:47:17 2006
New Revision: 660
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=660
Log:
Patches 011 and 012.
Added:
trunk/packages/vim/upstream/patches/7.0.011
trunk/packages/vim/upstream/patches/7.0.012
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=660&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Thu May 11 17:47:17 2006
@@ -35,3 +35,5 @@
2081 7.0.008 Can't call a function that uses both <SID> and {expr}
1625 7.0.009 ml_get errors when 'spell' is set
3705 7.0.010 spellfile plugin required typing login name and password
+ 1989 7.0.011 can't compile with eval feature without folding feature
+ 2532 7.0.012 matchparen plugin changed cursor column in Insert mode
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=660&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu May 11 17:47:17 2006
@@ -1,3 +1,10 @@
+vim (1:7.0-012+1) UNRELEASED; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (011 - 012), see README.gz for details.
+
+ -- James Vega <jamessan at debian.org> Thu, 11 May 2006 13:45:36 -0400
+
vim (1:7.0-010+1) experimental; urgency=low
[ Debian Vim Maintainers ]
Added: trunk/packages/vim/upstream/patches/7.0.011
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.011?rev=660&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.011 (added)
+++ trunk/packages/vim/upstream/patches/7.0.011 Thu May 11 17:47:17 2006
@@ -1,0 +1,65 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.011
+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.011
+Problem: Can't compile without the folding and with the eval feature.
+Solution: Add an #ifdef. (Vallimar)
+Files: src/option.c
+
+
+*** ../vim-7.0.010/src/option.c Wed May 10 15:22:50 2006
+--- src/option.c Wed May 10 19:37:10 2006
+***************
+*** 5227,5239 ****
+ case PV_STL: return &curwin->w_p_stl_flags;
+ #endif
+ #ifdef FEAT_EVAL
+ case PV_FDE: return &curwin->w_p_fde_flags;
+ case PV_FDT: return &curwin->w_p_fdt_flags;
+ # ifdef FEAT_BEVAL
+ case PV_BEXPR: return &curbuf->b_p_bexpr_flags;
+ # endif
+- #endif
+- #if defined(FEAT_EVAL)
+ # if defined(FEAT_CINDENT)
+ case PV_INDE: return &curbuf->b_p_inde_flags;
+ # endif
+--- 5227,5239 ----
+ case PV_STL: return &curwin->w_p_stl_flags;
+ #endif
+ #ifdef FEAT_EVAL
++ # ifdef FEAT_FOLDING
+ case PV_FDE: return &curwin->w_p_fde_flags;
+ case PV_FDT: return &curwin->w_p_fdt_flags;
++ # endif
+ # ifdef FEAT_BEVAL
+ case PV_BEXPR: return &curbuf->b_p_bexpr_flags;
+ # endif
+ # if defined(FEAT_CINDENT)
+ case PV_INDE: return &curbuf->b_p_inde_flags;
+ # endif
+*** ../vim-7.0.010/src/version.c Wed May 10 17:55:37 2006
+--- src/version.c Thu May 11 19:22:54 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 11,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+112. You are amazed that anyone uses a phone without a modem on it...let
+ alone hear actual voices.
+
+ /// 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.012
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.012?rev=660&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.012 (added)
+++ trunk/packages/vim/upstream/patches/7.0.012 Thu May 11 17:47:17 2006
@@ -1,0 +1,84 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.012
+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.012
+Problem: Using the matchparen plugin, moving the cursor in Insert mode to a
+ shorter line that ends in a brace, changes the preferred column
+Solution: Use winsaveview()/winrestview() instead of getpos()/setpos().
+Files: runtime/plugin/matchparen.vim
+
+
+*** ../vim-7.0.011/runtime/plugin/matchparen.vim Wed May 10 15:22:55 2006
+--- runtime/plugin/matchparen.vim Thu May 11 14:42:55 2006
+***************
+*** 1,6 ****
+ " Vim plugin for showing matching parens
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Apr 27
+
+ " 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 May 11
+
+ " Exit quickly when:
+ " - this plugin was already loaded (or disabled)
+***************
+*** 90,96 ****
+ " Find the match. When it was just before the cursor move it there for a
+ " moment.
+ if before > 0
+! let save_cursor = getpos('.')
+ call cursor(c_lnum, c_col - before)
+ endif
+
+--- 90,96 ----
+ " Find the match. When it was just before the cursor move it there for a
+ " moment.
+ if before > 0
+! let save_cursor = winsaveview()
+ call cursor(c_lnum, c_col - before)
+ endif
+
+***************
+*** 102,108 ****
+ let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
+
+ if before > 0
+! call setpos('.', save_cursor)
+ endif
+
+ " If a match is found setup match highlighting.
+--- 102,108 ----
+ let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
+
+ if before > 0
+! call winrestview(save_cursor)
+ endif
+
+ " If a match is found setup match highlighting.
+*** ../vim-7.0.011/src/version.c Thu May 11 19:24:16 2006
+--- src/version.c Thu May 11 19:29:58 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 12,
+ /**/
+
+--
+Corduroy pillows: They're making headlines!
+
+ /// 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