r1223 - in /trunk/packages/vim: debian/README debian/changelog patches/series patches/term.c_device-attributes.diff upstream/patches/7.1.266
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Feb 27 16:36:57 UTC 2008
Author: jamessan
Date: Wed Feb 27 16:36:57 2008
New Revision: 1223
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1223
Log:
* New upstream patches (246 - 266), see README.gz for details.
- 7.1.266 fixes an issue where Vim would stop parsing a terminal response
early, causing the rest of the response to be interpreted as key presses
from the user. (Closes: #466789)
Added:
trunk/packages/vim/upstream/patches/7.1.266
Removed:
trunk/packages/vim/patches/term.c_device-attributes.diff
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=1223&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Feb 27 16:36:57 2008
@@ -297,3 +297,4 @@
2442 7.1.263 filetype with dot doesn't work for indent plugins
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
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1223&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Feb 27 16:36:57 2008
@@ -1,9 +1,12 @@
-vim (1:7.1-265+1) UNRELEASED; urgency=low
+vim (1:7.1-266+1) UNRELEASED; urgency=low
[ James Vega ]
- * New upstream patches (246 - 265), see README.gz for details.
+ * New upstream patches (246 - 266), see README.gz for details.
- 7.1.265 fixes an infinite loop when <Space> is included in 'isfname' and
the user tries to complete a filename. (Closes: #465163)
+ - 7.1.266 fixes an issue where Vim would stop parsing a terminal response
+ early, causing the rest of the response to be interpreted as key presses
+ from the user. (Closes: #466789)
* debian/control:
- Build-Depend on tcl-dev instead of tcl8.4-dev per Tcl/Tk policy.
* Added patches:
@@ -33,12 +36,6 @@
mishighlighting of debcontrolHTTPUrl matches. (Closes: #466338)
* debian/control:
- Add "Provides: vim" to all vim variant packages. (Closes: #447714)
- * Added patches:
- - term.c_device-attributes.diff:
- + Be less strict when parsing the terminals response to the "Send Device
- Attributes" so that the entire response is read by the parser. This
- prevents part of the response from bleeding into the actual Vim
- session and possibly changing the buffer. (Closes: #466789)
-- martin f. krafft <madduck at debian.org> Thu, 21 Feb 2008 17:00:37 +0100
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1223&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Wed Feb 27 16:36:57 2008
@@ -35,4 +35,3 @@
make.vim-syntax.diff -p0
vim-git.diff -p2
last-position-jump.diff -p0
-term.c_device-attributes.diff -p0
Added: trunk/packages/vim/upstream/patches/7.1.266
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.266?rev=1223&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.266 (added)
+++ trunk/packages/vim/upstream/patches/7.1.266 Wed Feb 27 16:36:57 2008
@@ -1,0 +1,71 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.266
+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.266
+Problem: When the version string returned by the terminal contains
+ unexpected characters, it is used as typed input. (James Vega)
+Solution: Assume the escape sequence ends in a letter.
+Files: src/term.c
+
+
+*** ../vim-7.1.265/src/term.c Sat Sep 15 14:06:41 2007
+--- src/term.c Mon Feb 25 20:21:53 2008
+***************
+*** 4050,4064 ****
+ {
+ /* Check for xterm version string: "<Esc>[>{x};{vers};{y}c". Also
+ * eat other possible responses to t_RV, rxvt returns
+! * "<Esc>[?1;2c". Also accept CSI instead of <Esc>[. */
+ if (*T_CRV != NUL && ((tp[0] == ESC && tp[1] == '[' && len >= 3)
+ || (tp[0] == CSI && len >= 2)))
+ {
+ j = 0;
+ extra = 0;
+! for (i = 2 + (tp[0] != CSI);
+! i < len && (VIM_ISDIGIT(tp[i])
+! || tp[i] == ';' || tp[i] == '.'); ++i)
+ if (tp[i] == ';' && ++j == 1)
+ extra = atoi((char *)tp + i + 1);
+ if (i == len)
+--- 4050,4066 ----
+ {
+ /* Check for xterm version string: "<Esc>[>{x};{vers};{y}c". Also
+ * eat other possible responses to t_RV, rxvt returns
+! * "<Esc>[?1;2c". Also accept CSI instead of <Esc>[.
+! * mrxvt has been reported to have "+" in the version. Assume
+! * the escape sequence ends with a letter or one of "{|}~". */
+ if (*T_CRV != NUL && ((tp[0] == ESC && tp[1] == '[' && len >= 3)
+ || (tp[0] == CSI && len >= 2)))
+ {
+ j = 0;
+ extra = 0;
+! for (i = 2 + (tp[0] != CSI); i < len
+! && !(tp[i] >= '{' && tp[i] <= '~')
+! && !ASCII_ISALPHA(tp[i]); ++i)
+ if (tp[i] == ';' && ++j == 1)
+ extra = atoi((char *)tp + i + 1);
+ if (i == len)
+*** ../vim-7.1.265/src/version.c Tue Feb 26 21:29:06 2008
+--- src/version.c Wed Feb 27 16:10:59 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 266,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+54. You start tilting your head sideways to smile. :-)
+
+ /// 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