r1231 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.267 upstream/patches/7.1.268 upstream/patches/7.1.269 upstream/patches/7.1.270
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Mar 11 00:32:02 UTC 2008
Author: jamessan
Date: Tue Mar 11 00:32:02 2008
New Revision: 1231
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1231
Log:
* New upstream patches (267 - 270), see README.gz for details.
Added:
trunk/packages/vim/upstream/patches/7.1.267
trunk/packages/vim/upstream/patches/7.1.268
trunk/packages/vim/upstream/patches/7.1.269
trunk/packages/vim/upstream/patches/7.1.270
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=1231&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Mar 11 00:32:02 2008
@@ -298,3 +298,7 @@
6295 7.1.264 crash when C-indenting
1310 7.1.265 hang when completing file name and space in 'isfname'
2510 7.1.266 version string returned by terminal may be used as typed input
+ 1957 7.1.267 when changing folds cursor may be positioned in a wrong place
+ 1576 7.1.268 always shows "+" at end of screen line with 'cursurline'
+ 6183 7.1.269 matchparen plugin has an arbitrary line number limit
+ 2861 7.1.270 ":?foo?" matches in current line since patch 7.1.025
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1231&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Mar 11 00:32:02 2008
@@ -1,5 +1,6 @@
-vim (1:7.1-266+2) UNRELEASED; urgency=low
-
+vim (1:7.1-270+1) UNRELEASED; urgency=low
+
+ * New upstream patches (267 - 270), see README.gz for details.
* Added patches:
- option.c-p_para.diff:
+ Recognize a few extra groff macros (TP, HP, Pp, Lp, and It) in the
Added: trunk/packages/vim/upstream/patches/7.1.267
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.267?rev=1231&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.267 (added)
+++ trunk/packages/vim/upstream/patches/7.1.267 Tue Mar 11 00:32:02 2008
@@ -1,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.267
+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.1.267
+Problem: When changing folds cursor may be positioned in the wrong place.
+Solution: Call changed_window_setting_win() instead of
+ changed_window_setting().
+Files: src/fold.c
+
+
+*** ../vim-7.1.266/src/fold.c Sun Jan 13 21:57:25 2008
+--- src/fold.c Wed Mar 5 12:48:43 2008
+***************
+*** 2307,2313 ****
+
+ /* If some fold changed, need to redraw and position cursor. */
+ if (fold_changed && wp->w_p_fen)
+! changed_window_setting();
+
+ /* If we updated folds past "bot", need to redraw more lines. Don't do
+ * this in other situations, the changed lines will be redrawn anyway and
+--- 2307,2313 ----
+
+ /* If some fold changed, need to redraw and position cursor. */
+ if (fold_changed && wp->w_p_fen)
+! changed_window_setting_win(wp);
+
+ /* If we updated folds past "bot", need to redraw more lines. Don't do
+ * this in other situations, the changed lines will be redrawn anyway and
+*** ../vim-7.1.266/src/version.c Wed Feb 27 16:13:09 2008
+--- src/version.c Thu Mar 6 22:43:05 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 267,
+ /**/
+
+--
+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.1.268
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.268?rev=1231&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.268 (added)
+++ trunk/packages/vim/upstream/patches/7.1.268 Tue Mar 11 00:32:02 2008
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.268
+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.1.268
+Problem: Always shows "+" at end of screen line with: ":set
+ listchars=eol:$,extends:+ nowrap list cursorline" (Gary Johnson)
+Solution: Check for lcs_eol_one instead of lcs_eol.
+Files: src/screen.c
+
+
+*** ../vim-7.1.267/src/screen.c Wed Feb 20 14:15:45 2008
+--- src/screen.c Sun Mar 9 14:26:14 2008
+***************
+*** 4527,4533 ****
+ #endif
+ col == W_WIDTH(wp) - 1)
+ && (*ptr != NUL
+! || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
+ || (n_extra && (c_extra != NUL || *p_extra != NUL))))
+ {
+ c = lcs_ext;
+--- 4527,4533 ----
+ #endif
+ col == W_WIDTH(wp) - 1)
+ && (*ptr != NUL
+! || (wp->w_p_list && lcs_eol_one > 0)
+ || (n_extra && (c_extra != NUL || *p_extra != NUL))))
+ {
+ c = lcs_ext;
+*** ../vim-7.1.267/src/version.c Thu Mar 6 22:44:45 2008
+--- src/version.c Sun Mar 9 14:24:59 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 268,
+ /**/
+
+--
+From "know your smileys":
+ :-* A big kiss!
+
+ /// 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.1.269
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.269?rev=1231&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.269 (added)
+++ trunk/packages/vim/upstream/patches/7.1.269 Tue Mar 11 00:32:02 2008
@@ -1,0 +1,171 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.269
+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.1.269
+Problem: The matchparen plugin has an arbitrary limit for the number of
+ lines to look for a match.
+Solution: Rely on the searchpair() timeout.
+Files: runtime/plugin/matchparen.vim
+
+
+*** ../vim-7.1.268/runtime/plugin/matchparen.vim Sun Jan 6 20:05:36 2008
+--- runtime/plugin/matchparen.vim Wed Feb 27 22:39:32 2008
+***************
+*** 1,6 ****
+ " Vim plugin for showing matching parens
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2008 Jan 06
+
+ " 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: 2008 Feb 27
+
+ " Exit quickly when:
+ " - this plugin was already loaded (or disabled)
+***************
+*** 34,40 ****
+ endif
+
+ " Avoid that we remove the popup menu.
+! if pumvisible()
+ return
+ endif
+
+--- 34,41 ----
+ endif
+
+ " Avoid that we remove the popup menu.
+! " Return when there are no colors (looks like the cursor jumps).
+! if pumvisible() || (&t_Co < 8 && !has("gui_running"))
+ return
+ endif
+
+***************
+*** 60,98 ****
+ endif
+
+ " Figure out the arguments for searchpairpos().
+- " Restrict the search to visible lines with "stopline".
+- " And avoid searching very far (e.g., for closed folds and long lines)
+- " The "viewable" variables give a range in which we can scroll while keeping
+- " the cursor at the same position
+- " adjustedScrolloff accounts for very large numbers of scrolloff
+- let adjustedScrolloff = min([&scrolloff, (line('w$') - line('w0')) / 2])
+- let bottom_viewable = min([line('$'), c_lnum + &lines - adjustedScrolloff - 2])
+- let top_viewable = max([1, c_lnum-&lines+adjustedScrolloff + 2])
+- " one of these stoplines will be adjusted below, but the current values are
+- " minimal boundaries within the current window
+- let stoplinebottom = line('w$')
+- let stoplinetop = line('w0')
+ if i % 2 == 0
+ let s_flags = 'nW'
+ let c2 = plist[i + 1]
+- if has("byte_offset") && has("syntax_items") && &smc > 0
+- let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
+- let stopline = min([bottom_viewable, byte2line(stopbyte)])
+- else
+- let stopline = min([bottom_viewable, c_lnum + 100])
+- endif
+- let stoplinebottom = stopline
+ else
+ let s_flags = 'nbW'
+ let c2 = c
+ let c = plist[i - 1]
+- if has("byte_offset") && has("syntax_items") && &smc > 0
+- let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
+- let stopline = max([top_viewable, byte2line(stopbyte)])
+- else
+- let stopline = max([top_viewable, c_lnum - 100])
+- endif
+- let stoplinetop = stopline
+ endif
+ if c == '['
+ let c = '\['
+--- 61,73 ----
+***************
+*** 111,120 ****
+ \ '=~? "string\\|character\\|singlequote\\|comment"'
+ execute 'if' s_skip '| let s_skip = 0 | endif'
+
+ try
+! " Limit the search time to 500 msec to avoid a hang on very long lines.
+! let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline, 500)
+ catch /E118/
+ let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
+ endtry
+
+--- 86,132 ----
+ \ '=~? "string\\|character\\|singlequote\\|comment"'
+ execute 'if' s_skip '| let s_skip = 0 | endif'
+
++ " Limit the search to lines visible in the window.
++ let stoplinebottom = line('w$')
++ let stoplinetop = line('w0')
++ if i % 2 == 0
++ let stopline = stoplinebottom
++ else
++ let stopline = stoplinetop
++ endif
++
+ try
+! " Limit the search time to 300 msec to avoid a hang on very long lines.
+! " This fails when a timeout is not supported.
+! let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline, 300)
+ catch /E118/
++ " Can't use the timeout, restrict the stopline a bit more to avoid taking
++ " a long time on closed folds and long lines.
++ " The "viewable" variables give a range in which we can scroll while
++ " keeping the cursor at the same position.
++ " adjustedScrolloff accounts for very large numbers of scrolloff.
++ let adjustedScrolloff = min([&scrolloff, (line('w$') - line('w0')) / 2])
++ let bottom_viewable = min([line('$'), c_lnum + &lines - adjustedScrolloff - 2])
++ let top_viewable = max([1, c_lnum-&lines+adjustedScrolloff + 2])
++ " one of these stoplines will be adjusted below, but the current values are
++ " minimal boundaries within the current window
++ if i % 2 == 0
++ if has("byte_offset") && has("syntax_items") && &smc > 0
++ let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
++ let stopline = min([bottom_viewable, byte2line(stopbyte)])
++ else
++ let stopline = min([bottom_viewable, c_lnum + 100])
++ endif
++ let stoplinebottom = stopline
++ else
++ if has("byte_offset") && has("syntax_items") && &smc > 0
++ let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
++ let stopline = max([top_viewable, byte2line(stopbyte)])
++ else
++ let stopline = max([top_viewable, c_lnum - 100])
++ endif
++ let stoplinetop = stopline
++ endif
+ let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
+ endtry
+
+*** ../vim-7.1.268/src/version.c Sun Mar 9 14:30:12 2008
+--- src/version.c Sun Mar 9 16:21:00 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 269,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+93. New mail alarm on your palmtop annoys other churchgoers.
+
+ /// 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.1.270
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.270?rev=1231&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.270 (added)
+++ trunk/packages/vim/upstream/patches/7.1.270 Tue Mar 11 00:32:02 2008
@@ -1,0 +1,94 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.270
+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.1.270
+Problem: ":?foo?" matches in current line since patch 7.1.025. (A.Politz)
+Solution: Remove the SEARCH_START flag.
+Files: src/ex_docmd.c, src/search.c
+
+
+*** ../vim-7.1.269/src/ex_docmd.c Tue Feb 26 21:29:06 2008
+--- src/ex_docmd.c Sun Mar 2 20:50:43 2008
+***************
+*** 3932,3939 ****
+ curwin->w_cursor.col = 0;
+ searchcmdlen = 0;
+ if (!do_search(NULL, c, cmd, 1L,
+! SEARCH_HIS + SEARCH_MSG + SEARCH_START,
+! NULL))
+ {
+ curwin->w_cursor = pos;
+ cmd = NULL;
+--- 3932,3938 ----
+ curwin->w_cursor.col = 0;
+ searchcmdlen = 0;
+ if (!do_search(NULL, c, cmd, 1L,
+! SEARCH_HIS | SEARCH_MSG, NULL))
+ {
+ curwin->w_cursor = pos;
+ cmd = NULL;
+***************
+*** 3980,3987 ****
+ pos.col = 0;
+ if (searchit(curwin, curbuf, &pos,
+ *cmd == '?' ? BACKWARD : FORWARD,
+! (char_u *)"", 1L,
+! SEARCH_MSG + SEARCH_START,
+ i, (linenr_T)0, NULL) != FAIL)
+ lnum = pos.lnum;
+ else
+--- 3979,3985 ----
+ pos.col = 0;
+ if (searchit(curwin, curbuf, &pos,
+ *cmd == '?' ? BACKWARD : FORWARD,
+! (char_u *)"", 1L, SEARCH_MSG,
+ i, (linenr_T)0, NULL) != FAIL)
+ lnum = pos.lnum;
+ else
+*** ../vim-7.1.269/src/search.c Wed Feb 20 13:41:14 2008
+--- src/search.c Sun Mar 2 22:00:50 2008
+***************
+*** 538,544 ****
+ return FAIL;
+ }
+
+! if (options & SEARCH_START)
+ extra_col = 0;
+ #ifdef FEAT_MBYTE
+ /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
+--- 538,547 ----
+ return FAIL;
+ }
+
+! /* When not accepting a match at the start position set "extra_col" to a
+! * non-zero value. Don't do that when starting at MAXCOL, since MAXCOL +
+! * 1 is zero. */
+! if ((options & SEARCH_START) || pos->col == MAXCOL)
+ extra_col = 0;
+ #ifdef FEAT_MBYTE
+ /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
+*** ../vim-7.1.269/src/version.c Sun Mar 9 16:45:16 2008
+--- src/version.c Mon Mar 10 21:32:07 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 270,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+102. When filling out your driver's license application, you give
+ your IP address.
+
+ /// 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