r1005 - in /trunk/packages/vim: debian/README debian/changelog patches/index.txt.diff patches/series upstream/patches/7.1.056
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Aug 8 00:22:54 UTC 2007
Author: jamessan
Date: Wed Aug 8 00:22:54 2007
New Revision: 1005
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1005
Log:
* New upstream patches (023 - 056), see README.gz for details.
* Add index.txt.diff, which adds some missing cross-references to the index
of Vim commands. (Closes: #434447)
Added:
trunk/packages/vim/patches/index.txt.diff
trunk/packages/vim/upstream/patches/7.1.056
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/series
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1005&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Aug 8 00:22:54 2007
@@ -80,3 +80,4 @@
1473 7.1.053 reading uninitialized memory when updating command line
4451 7.1.054 accessing uninitialized memory when displaying the fold column
5414 7.1.055 using strcpy() with arguments that overlap
+ 3151 7.1.056 scrolling back at more prompt doesn't work properly
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1005&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Aug 8 00:22:54 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-055+1) unstable; urgency=low
+vim (1:7.1-056+1) unstable; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (023 - 055), see README.gz for details.
+ * New upstream patches (023 - 056), see README.gz for details.
[ Pierre Habouzit ]
* Make sure reportbug vim/presubj is named that way, without a `vim.` prefix
@@ -29,8 +29,10 @@
* Add ruby.vim_indent.diff, which fixes some improper indenting for Ruby
files. (Closes: #431212)
* Refresh vimrc.tiny.diff
-
- -- James Vega <jamessan at debian.org> Tue, 07 Aug 2007 13:42:54 -0400
+ * Add index.txt.diff, which adds some missing cross-references to the index
+ of Vim commands. (Closes: #434447)
+
+ -- James Vega <jamessan at debian.org> Tue, 07 Aug 2007 20:22:10 -0400
vim (1:7.1-022+1) unstable; urgency=low
Added: trunk/packages/vim/patches/index.txt.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/index.txt.diff?rev=1005&op=file
==============================================================================
--- trunk/packages/vim/patches/index.txt.diff (added)
+++ trunk/packages/vim/patches/index.txt.diff Wed Aug 8 00:22:54 2007
@@ -1,0 +1,68 @@
+Index: vim/runtime/doc/index.txt
+===================================================================
+--- vim/runtime/doc/index.txt.orig
++++ vim/runtime/doc/index.txt
+@@ -467,6 +467,7 @@
+ |v_ab| ab "a block" from "[(" to "])" (with braces)
+ |v_ap| ap "a paragraph" (with white space)
+ |v_as| as "a sentence" (with white space)
++|v_at| at "a tag block" (with tags)
+ |v_aw| aw "a word" (with white space)
+ |v_a{| a{ same as aB
+ |v_a}| a} same as aB
+@@ -484,6 +485,7 @@
+ |v_ib| ib "inner block" from "[(" to "])"
+ |v_ip| ip "inner paragraph"
+ |v_is| is "inner sentence"
++|v_it| it "inner tag block"
+ |v_iw| iw "inner word"
+ |v_i{| i{ same as iB
+ |v_i}| i} same as iB
+@@ -874,6 +876,10 @@
+ mode
+ |v_X| X 2 delete the highlighted lines
+ |v_Y| Y yank the highlighted lines
++|v_aquote| a" extend highlighted area with a double
++ quoted string
++|v_a'| a' extend highlighted area with a single
++ quoted string
+ |v_a(| a( same as ab
+ |v_a)| a) same as ab
+ |v_a<| a< extend highlighted area with a <> block
+@@ -882,9 +888,12 @@
+ |v_aW| aW extend highlighted area with "a WORD"
+ |v_a[| a[ extend highlighted area with a [] block
+ |v_a]| a] same as a[
++|v_a`| a` extend highlighted area with a backtick
++ quoted string
+ |v_ab| ab extend highlighted area with a () block
+ |v_ap| ap extend highlighted area with a paragraph
+ |v_as| as extend highlighted area with a sentence
++|v_at| at extend highlighted area with a tag block
+ |v_aw| aw extend highlighted area with "a word"
+ |v_a{| a{ same as aB
+ |v_a}| a} same as aB
+@@ -895,6 +904,10 @@
+ |v_gq| gq 2 format the highlighted lines
+ |v_gv| gv exchange current and previous highlighted
+ area
++|v_iquote| i" extend highlighted area with a double
++ quoted string (without quotes)
++|v_i'| i' extend highlighted area with a single
++ quoted string (without quotes)
+ |v_i(| i( same as ib
+ |v_i)| i) same as ib
+ |v_i<| i< extend highlighted area with inner <> block
+@@ -903,9 +916,12 @@
+ |v_iW| iW extend highlighted area with "inner WORD"
+ |v_i[| i[ extend highlighted area with inner [] block
+ |v_i]| i] same as i[
++|v_i`| i` extend highlighted area with a backtick
++ quoted string (without backticks)
+ |v_ib| ib extend highlighted area with inner () block
+ |v_ip| ip extend highlighted area with inner paragraph
+ |v_is| is extend highlighted area with inner sentence
++|v_it| it extend highlighted area with inner tag block
+ |v_iw| iw extend highlighted area with "inner word"
+ |v_i{| i{ same as iB
+ |v_i}| i} same as iB
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1005&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Wed Aug 8 00:22:54 2007
@@ -21,3 +21,4 @@
gui_gtk_x11.c_g_thread_init.diff -p0
verilog.vim_ftplugin-cpoptions.diff -p0
ruby.vim_indent.diff -p0
+index.txt.diff -p0
Added: trunk/packages/vim/upstream/patches/7.1.056
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.056?rev=1005&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.056 (added)
+++ trunk/packages/vim/upstream/patches/7.1.056 Wed Aug 8 00:22:54 2007
@@ -1,0 +1,106 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.056
+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.056
+Problem: More prompt does not behave correctly after scrolling back.
+ (Randall W. Morris)
+Solution: Avoid lines_left becomes negative. (Chris Lubinski) Don't check
+ mp_last when deciding to show the more prompt. (Martin Toft)
+Files: src/message.c
+
+
+*** ../vim-7.1.055/src/message.c Sun Aug 5 19:20:04 2007
+--- src/message.c Tue Aug 7 21:52:10 2007
+***************
+*** 1878,1884 ****
+ /* output postponed text */
+ t_puts(&t_col, t_s, s, attr);
+
+! /* When no more prompt an no more room, truncate here */
+ if (msg_no_more && lines_left == 0)
+ break;
+
+--- 1878,1884 ----
+ /* output postponed text */
+ t_puts(&t_col, t_s, s, attr);
+
+! /* When no more prompt and no more room, truncate here */
+ if (msg_no_more && lines_left == 0)
+ break;
+
+***************
+*** 1927,1933 ****
+ * If screen is completely filled and 'more' is set then wait
+ * for a character.
+ */
+! --lines_left;
+ if (p_more && lines_left == 0 && State != HITRETURN
+ && !msg_no_more && !exmode_active)
+ {
+--- 1927,1934 ----
+ * If screen is completely filled and 'more' is set then wait
+ * for a character.
+ */
+! if (lines_left > 0)
+! --lines_left;
+ if (p_more && lines_left == 0 && State != HITRETURN
+ && !msg_no_more && !exmode_active)
+ {
+***************
+*** 2234,2240 ****
+ {
+ msgchunk_T *mp;
+
+! /* Only show somethign if there is more than one line, otherwise it looks
+ * weird, typing a command without output results in one line. */
+ mp = msg_sb_start(last_msgchunk);
+ if (mp == NULL || mp->sb_prev == NULL)
+--- 2235,2241 ----
+ {
+ msgchunk_T *mp;
+
+! /* Only show something if there is more than one line, otherwise it looks
+ * weird, typing a command without output results in one line. */
+ mp = msg_sb_start(last_msgchunk);
+ if (mp == NULL || mp->sb_prev == NULL)
+***************
+*** 2622,2628 ****
+ }
+ }
+
+! if (scroll < 0 || (scroll == 0 && mp_last != NULL))
+ {
+ /* displayed the requested text, more prompt again */
+ screen_fill((int)Rows - 1, (int)Rows, 0,
+--- 2623,2629 ----
+ }
+ }
+
+! if (scroll <= 0)
+ {
+ /* displayed the requested text, more prompt again */
+ screen_fill((int)Rows - 1, (int)Rows, 0,
+*** ../vim-7.1.055/src/version.c Mon Aug 6 22:27:13 2007
+--- src/version.c Tue Aug 7 21:57:02 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 56,
+ /**/
+
+--
+From "know your smileys":
+ :-| :-| Deja' vu!
+
+ /// 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