r226 - in trunk/vim: debian upstream/patches

Matthijs Mohlmann active2-guest@costa.debian.org
Tue, 14 Jun 2005 19:25:45 +0000


Author: active2-guest
Date: 2005-06-14 19:25:43 +0000 (Tue, 14 Jun 2005)
New Revision: 226

Added:
   trunk/vim/upstream/patches/6.3.078
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
 * New upstream patch


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-06-14 14:21:21 UTC (rev 225)
+++ trunk/vim/debian/README	2005-06-14 19:25:43 UTC (rev 226)
@@ -102,3 +102,4 @@
   1745  6.3.075  syntax highlighting wrong after unloading another buffer
   3546  6.3.076  crash when using Cscope interface with very long result
   1934  6.3.077  (extra) VMS: character after ESC not handled correctly
+  2508  6.3.078  (extra, after 6.3.077) VMS: performance issue

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-06-14 14:21:21 UTC (rev 225)
+++ trunk/vim/debian/changelog	2005-06-14 19:25:43 UTC (rev 226)
@@ -1,12 +1,12 @@
 vim (1:6.3-076+1) UNRELEASED; urgency=low
 
-  * New upstream patches (073 to 077), see README.gz for details.
+  * New upstream patches (073 to 078), see README.gz for details.
 
   * James Vega <jamessan@jamessan.com>
     + Added patch 128_vimdiff.1.diff, which fixes a typo in the vimdiff
       manpage.  (closes: #310331)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 14 Jun 2005 16:20:49 +0200
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 14 Jun 2005 21:25:00 +0200
 
 vim (1:6.3-072+1) unstable; urgency=high
 

Added: trunk/vim/upstream/patches/6.3.078
===================================================================
--- trunk/vim/upstream/patches/6.3.078	2005-06-14 14:21:21 UTC (rev 225)
+++ trunk/vim/upstream/patches/6.3.078	2005-06-14 19:25:43 UTC (rev 226)
@@ -0,0 +1,76 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.078 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.078 (extra, after 6.3.077)
+Problem:    VMS: Performance issue after patch 6.3.077
+Solution:   Add a timeout in the itemlist.  (Zoltan Arpadffy)
+Files:	    src/os_vms.c
+
+
+*** ../vim-6.3.077/src/os_vms.c	Tue Jun 14 14:04:07 2005
+--- src/os_vms.c	Tue Jun 14 19:03:58 2005
+***************
+*** 300,306 ****
+  {
+      int		status, function, len;
+      TT_MODE	tt_mode;
+!     ITEM	itmlst[2];
+      static long trm_mask[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
+  
+      /* whatever happened earlier we need an iochan here */
+--- 300,306 ----
+  {
+      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 */
+***************
+*** 308,317 ****
+  	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], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0);
+  
+      function = (IO$_READLBLK | IO$M_EXTEND);
+      memset(inbuf, 0, nbytes);
+--- 308,318 ----
+  	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);
+*** ../vim-6.3.077/src/version.c	Tue Jun 14 14:04:07 2005
+--- src/version.c	Tue Jun 14 19:05:34 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     78,
+  /**/
+
+-- 
+From "know your smileys":
+ O:-)	Saint
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///