r1202 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.245

Mon Feb 11 15:27:45 UTC 2008

Author: jamessan
Date: Mon Feb 11 15:27:45 2008
New Revision: 1202

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1202
Log:
Add upstream patch 245 and release

Added:
    trunk/packages/vim/upstream/patches/7.1.245
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=1202&op=diff
==============================================================================

--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Mon Feb 11 15:27:45 2008
@@ -276,3 +276,4 @@
   2262  7.1.242  "cib" doesn't work properly on "(x)"
   4475  7.1.243  (after 7.1.240) "U" doesn't work on all text in Visual mode
   1847  7.1.244  GUI may have part of the command line cut off
+  2767  7.1.245  pressing CTRL-\ three times causes Vim to quit

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1202&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Feb 11 15:27:45 2008
@@ -1,6 +1,6 @@
-vim (1:7.1-244+1) UNRELEASED; urgency=low
-
-  * New upstream patches (242 - 244), see README.gz for details.
+vim (1:7.1-245+1) unstable; urgency=low
+
+  * New upstream patches (242 - 245), see README.gz for details.
     - 7.1.244 fixes an issue where a maximized gvim window would size itself
       larger than the size of the workspace, cutting off part of the
       command-line.  (Closes: #378311)
@@ -35,7 +35,7 @@
     - Adjust copyright string (capitalize the C) so it's recognized by
       Lintian.
 
- -- James Vega <jamessan at debian.org>  Sat, 09 Feb 2008 18:54:33 -0500
+ -- James Vega <jamessan at debian.org>  Mon, 11 Feb 2008 10:27:17 -0500
 
 vim (1:7.1-241+1) unstable; urgency=low
 

Added: trunk/packages/vim/upstream/patches/7.1.245
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.245?rev=1202&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.245 (added)
+++ trunk/packages/vim/upstream/patches/7.1.245 Mon Feb 11 15:27:45 2008
@@ -1,0 +1,92 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.245
+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.245
+Problem:    Pressing CTRL-\ three times causes Vim to quit.  (Ranganath Rao).
+	    Also for f CTRL-\ CTRL-\.
+Solution:   When going to cooked mode in mch_delay() set a flag to ignore
+	    SIGQUIT.
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.1.244/src/os_unix.c	Sun Jan 13 16:30:23 2008
+--- src/os_unix.c	Sun Feb 10 22:07:27 2008
+***************
+*** 195,200 ****
+--- 195,201 ----
+  static int	show_shell_mess = TRUE;
+  #endif
+  static int	deadly_signal = 0;	    /* The signal we caught */
++ static int	in_mch_delay = FALSE;	    /* sleeping in mch_delay() */
+  
+  static int curr_tmode = TMODE_COOK;	/* contains current terminal mode */
+  
+***************
+*** 538,544 ****
+      if (ignoreinput)
+      {
+  	/* Go to cooked mode without echo, to allow SIGINT interrupting us
+! 	 * here */
+  	old_tmode = curr_tmode;
+  	if (curr_tmode == TMODE_RAW)
+  	    settmode(TMODE_SLEEP);
+--- 539,547 ----
+      if (ignoreinput)
+      {
+  	/* Go to cooked mode without echo, to allow SIGINT interrupting us
+! 	 * here.  But we don't want QUIT to kill us (CTRL-\ used in a
+! 	 * shell may produce SIGQUIT). */
+! 	in_mch_delay = TRUE;
+  	old_tmode = curr_tmode;
+  	if (curr_tmode == TMODE_RAW)
+  	    settmode(TMODE_SLEEP);
+***************
+*** 602,607 ****
+--- 605,611 ----
+  #endif
+  
+  	settmode(old_tmode);
++ 	in_mch_delay = FALSE;
+      }
+      else
+  	WaitForChar(msec);
+***************
+*** 922,927 ****
+--- 926,939 ----
+  #endif
+  
+  #ifdef SIGHASARG
++ # ifdef SIGQUIT
++     /* While in mch_delay() we go to cooked mode to allow a CTRL-C to
++      * interrupt us.  But in cooked mode we may also get SIGQUIT, e.g., when
++      * pressing CTRL-\, but we don't want Vim to exit then. */
++     if (in_mch_delay && sigarg == SIGQUIT)
++ 	SIGRETURN;
++ # endif
++ 
+      /* When SIGHUP, SIGQUIT, etc. are blocked: postpone the effect and return
+       * here.  This avoids that a non-reentrant function is interrupted, e.g.,
+       * free().  Calling free() again may then cause a crash. */
+*** ../vim-7.1.244/src/version.c	Wed Feb  6 17:33:19 2008
+--- src/version.c	Sun Feb 10 22:04:09 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     245,
+  /**/
+
+-- 
+Me?  A skeptic?  I trust you have proof.
+
+ /// 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    ///


