r516 - in trunk/vim: debian upstream/patches
James Vega
jamessan at costa.debian.org
Mon Mar 20 14:13:27 UTC 2006
Author: jamessan
Date: 2006-03-20 14:13:26 +0000 (Mon, 20 Mar 2006)
New Revision: 516
Added:
trunk/vim/upstream/patches/6.4.010
Modified:
trunk/vim/debian/README
trunk/vim/debian/changelog
Log:
New upstream patch (6.4.010)
Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README 2006-03-19 11:02:14 UTC (rev 515)
+++ trunk/vim/debian/README 2006-03-20 14:13:26 UTC (rev 516)
@@ -34,3 +34,4 @@
1717 6.4.007 Unix: crash when expanding backticks
2199 6.4.008 hang for 'hlsearch' highlighting in multi-byte character
2653 6.4.009 (after 6.4.002) VMS: updating the viminfo file fails
+ 3493 6.4.010 (extra) VMS: improved low level keyboard input
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2006-03-19 11:02:14 UTC (rev 515)
+++ trunk/vim/debian/changelog 2006-03-20 14:13:26 UTC (rev 516)
@@ -1,7 +1,7 @@
-vim (1:6.4-009+1) UNRELEASED; urgency=low
+vim (1:6.4-010+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patch (009), see README.gz for details.
+ * New upstream patch (010), see README.gz for details.
[ Pierre Habouzit ]
* Support python `as' keyword. (closes: #352885)
@@ -20,7 +20,7 @@
* Added patch 160_scripts.vim.diff which adds support for bzr diffs in
scripts.vim, thanks to Adeodato Simó. (closes: #355922)
- -- Pierre Habouzit <madcoder at debian.org> Sun, 19 Mar 2006 11:58:16 +0100
+ -- James Vega <jamessan at debian.org> Mon, 20 Mar 2006 09:12:42 -0500
vim (1:6.4-007+1) unstable; urgency=low
Added: trunk/vim/upstream/patches/6.4.010
===================================================================
--- trunk/vim/upstream/patches/6.4.010 2006-03-19 11:02:14 UTC (rev 515)
+++ trunk/vim/upstream/patches/6.4.010 2006-03-20 14:13:26 UTC (rev 516)
@@ -0,0 +1,107 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4.010 (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 6.4.010 (extra)
+Problem: VMS: Reading typed characters in console mode is inefficient and
+ may not read escape sequences correctly.
+Solution: Improve the vms_read() function. (Zoltan Arpadffy)
+Files: src/os_vms.c
+
+
+*** ../vim-6.4.009/src/os_vms.c Tue Jun 14 19:03:58 2005
+--- src/os_vms.c Mon Mar 20 14:55:07 2006
+***************
+*** 300,330 ****
+ {
+ int status, function, len;
+ TT_MODE tt_mode;
+! ITEM itmlst[3];
+ static long trm_mask[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
+
+ /* whatever happened earlier we need an iochan here */
+ if (!iochan)
+ tt_mode = get_tty();
+
+ vul_item(&itmlst[0], 0, TRM$_MODIFIERS,
+! (char *)( TRM$M_TM_ESCAPE | TRM$M_TM_TIMED | TRM$M_TM_NOECHO |
+! TRM$M_TM_NOEDIT | TRM$M_TM_NOFILTR |
+! TRM$M_TM_NORECALL| TRM$M_TM_TRMNOECHO), 0);
+! vul_item(&itmlst[1], 0, TRM$_TIMEOUT, (char *) 1, 0 );
+! vul_item(&itmlst[2], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0);
+
+ function = (IO$_READLBLK | IO$M_EXTEND);
+! memset(inbuf, 0, nbytes);
+
+- while (1)
+- {
+- status = sys$qiow(0, iochan, function, &iosb, 0, 0, inbuf, nbytes - 1,
+- 0, 0, &itmlst, sizeof(itmlst));
+- len = strlen(inbuf);
+- if (len > 0)
+- break;
+- }
+ return len;
+ }
+
+--- 300,335 ----
+ {
+ int status, function, len;
+ TT_MODE tt_mode;
+! ITEM itmlst[2]; /* terminates on everything */
+ static long trm_mask[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
+
+ /* whatever happened earlier we need an iochan here */
+ if (!iochan)
+ tt_mode = get_tty();
+
++ /* important: clean the inbuf */
++ memset(inbuf, 0, nbytes);
++
++ /* set up the itemlist for the first read */
+ vul_item(&itmlst[0], 0, TRM$_MODIFIERS,
+! (char *)( TRM$M_TM_NOECHO | TRM$M_TM_NOEDIT |
+! TRM$M_TM_NOFILTR | TRM$M_TM_TRMNOECHO |
+! TRM$M_TM_NORECALL) , 0);
+! vul_item(&itmlst[1], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0);
+
++ /* wait forever for a char */
+ function = (IO$_READLBLK | IO$M_EXTEND);
+! status = sys$qiow(0, iochan, function, &iosb, 0, 0,
+! inbuf, nbytes-1, 0, 0, &itmlst, sizeof(itmlst));
+! len = strlen(inbuf); /* how many chars we got? */
+!
+! /* read immedatelly the rest in the IO queue */
+! function = (IO$_READLBLK | IO$M_TIMED | IO$M_ESCAPE | IO$M_NOECHO | IO$M_NOFILTR);
+! status = sys$qiow(0, iochan, function, &iosb, 0, 0,
+! inbuf+len, nbytes-1-len, 0, 0, 0, 0);
+!
+! len = strlen(inbuf); /* return the total length */
+
+ return len;
+ }
+
+*** ../vim-6.4.009/src/version.c Wed Mar 15 11:28:16 2006
+--- src/version.c Mon Mar 20 14:58:33 2006
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 10,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+181. You make up words that go with the "happy tune" your modem makes
+ while dialing your ISP.
+
+ /// 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://www.ICCF.nl ///
More information about the pkg-vim-maintainers
mailing list