r1089 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.156 upstream/patches/7.1.157 upstream/patches/7.1.158 upstream/patches/7.1.159 upstream/patches/7.1.160 upstream/patches/7.1.161

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sun Nov 25 16:33:47 UTC 2007


Author: jamessan
Date: Sun Nov 25 16:33:47 2007
New Revision: 1089

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1089
Log:
* New upstream patches (139 - 161), see README.gz for details.

Added:
    trunk/packages/vim/upstream/patches/7.1.156
    trunk/packages/vim/upstream/patches/7.1.157
    trunk/packages/vim/upstream/patches/7.1.158
    trunk/packages/vim/upstream/patches/7.1.159
    trunk/packages/vim/upstream/patches/7.1.160
    trunk/packages/vim/upstream/patches/7.1.161
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=1089&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sun Nov 25 16:33:47 2007
@@ -184,3 +184,9 @@
   4610  7.1.153  compiler warnings on SGI
   1547  7.1.154  (after 7.1.152) compiler warning for signed/unsigned compare
   1594  7.1.155  crash when 'undolevels' is 0 and repeating "udd"
+  4174  7.1.156  overlapping arguments for strcpy() during cmdline completion
+  1541  7.1.157  :" in Ex mode at end of file results in an error message
+  4629  7.1.158  (extra) Win32: with utf-8 and cp1250 Alt-y is the wrong char
+  1646  7.1.159  overlapping arguments for a strcpy()
+  1661  7.1.160  getting/losing focus may cause hit-enter prompt to be redrawn
+  4347  7.1.161  compilation errors with tiny features and EXITFREE

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1089&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sun Nov 25 16:33:47 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-155+1) UNRELEASED; urgency=low
+vim (1:7.1-161+1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (139 - 155), see README.gz for details.
+  * New upstream patches (139 - 161), see README.gz for details.
 
   [ James Vega ]
   * runtime/ftplugin/debchangelog.vim:
@@ -49,7 +49,7 @@
   * debian/README.Debian
     - fix typo in vim policy URL (Closes: #452555)
 
- -- Stefano Zacchiroli <zack at debian.org>  Fri, 23 Nov 2007 17:20:07 +0100
+ -- James Vega <jamessan at debian.org>  Sun, 25 Nov 2007 11:32:01 -0500
 
 vim (1:7.1-138+1) unstable; urgency=medium
 

Added: trunk/packages/vim/upstream/patches/7.1.156
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.156?rev=1089&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.156 (added)
+++ trunk/packages/vim/upstream/patches/7.1.156 Sun Nov 25 16:33:47 2007
@@ -1,0 +1,121 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.156
+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.156
+Problem:    Overlapping arguments for strcpy() when expanding command line
+	    variables.
+Solution:   Use mch_memmove() instead of STRCPY().  Also fix a few typos.
+	    (Dominique Pelle)
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.1.155/src/ex_docmd.c	Fri Oct 19 16:20:09 2007
+--- src/ex_docmd.c	Sat Nov 10 12:39:51 2007
+***************
+*** 666,672 ****
+  		if (ex_pressedreturn)
+  		{
+  		    /* go up one line, to overwrite the ":<CR>" line, so the
+! 		     * output doensn't contain empty lines. */
+  		    msg_row = prev_msg_row;
+  		    if (prev_msg_row == Rows - 1)
+  			msg_row--;
+--- 666,672 ----
+  		if (ex_pressedreturn)
+  		{
+  		    /* go up one line, to overwrite the ":<CR>" line, so the
+! 		     * output doesn't contain empty lines. */
+  		    msg_row = prev_msg_row;
+  		    if (prev_msg_row == Rows - 1)
+  			msg_row--;
+***************
+*** 2760,2766 ****
+  
+      /*
+       * Isolate the command and search for it in the command table.
+!      * Exeptions:
+       * - the 'k' command can directly be followed by any character.
+       * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
+       *	    but :sre[wind] is another command, as are :scrip[tnames],
+--- 2760,2766 ----
+  
+      /*
+       * Isolate the command and search for it in the command table.
+!      * Exceptions:
+       * - the 'k' command can directly be followed by any character.
+       * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
+       *	    but :sre[wind] is another command, as are :scrip[tnames],
+***************
+*** 6677,6683 ****
+   * The list should be allocated using alloc(), as should each item in the
+   * list. This function takes over responsibility for freeing the list.
+   *
+!  * XXX The list is made into the arggument list. This is freed using
+   * FreeWild(), which does a series of vim_free() calls, unless the two defines
+   * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
+   * routine _fnexplodefree() is used. This may cause problems, but as the drop
+--- 6677,6683 ----
+   * The list should be allocated using alloc(), as should each item in the
+   * list. This function takes over responsibility for freeing the list.
+   *
+!  * XXX The list is made into the argument list. This is freed using
+   * FreeWild(), which does a series of vim_free() calls, unless the two defines
+   * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
+   * routine _fnexplodefree() is used. This may cause problems, but as the drop
+***************
+*** 7795,7801 ****
+  	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
+  							     && !eap->forceit)
+  	{
+! 	    EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to override)"));
+  	    return;
+  	}
+  
+--- 7795,7801 ----
+  	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
+  							     && !eap->forceit)
+  	{
+! 	    EMSG(_("E747: Cannot change directory, buffer is modified (add ! to override)"));
+  	    return;
+  	}
+  
+***************
+*** 9391,9397 ****
+      if (src > srcstart && src[-1] == '\\')
+      {
+  	*usedlen = 0;
+! 	STRCPY(src - 1, src);		/* remove backslash */
+  	return NULL;
+      }
+  
+--- 9391,9397 ----
+      if (src > srcstart && src[-1] == '\\')
+      {
+  	*usedlen = 0;
+! 	mch_memmove(src - 1, src, STRLEN(src) + 1);	/* remove backslash */
+  	return NULL;
+      }
+  
+*** ../vim-7.1.155/src/version.c	Sat Nov 10 22:50:20 2007
+--- src/version.c	Sun Nov 11 19:15:51 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     156,
+  /**/
+
+-- 
+Common sense is what tells you that the world is flat.
+
+ /// 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    ///

Added: trunk/packages/vim/upstream/patches/7.1.157
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.157?rev=1089&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.157 (added)
+++ trunk/packages/vim/upstream/patches/7.1.157 Sun Nov 25 16:33:47 2007
@@ -1,0 +1,55 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.157
+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.157
+Problem:    In Ex mode, :" gives an error at end-of-file. (Michael Hordijk)
+Solution:   Only give an error for an empty line, not for a comment.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.1.156/src/ex_docmd.c	Sun Nov 11 19:16:44 2007
+--- src/ex_docmd.c	Sat Nov 17 20:23:38 2007
+***************
+*** 1741,1747 ****
+  	}
+  
+  	/* ignore comment and empty lines */
+! 	if (*ea.cmd == '"' || *ea.cmd == NUL)
+  	{
+  	    ex_pressedreturn = TRUE;
+  	    goto doend;
+--- 1741,1749 ----
+  	}
+  
+  	/* ignore comment and empty lines */
+! 	if (*ea.cmd == '"')
+! 	    goto doend;
+! 	if (*ea.cmd == NUL)
+  	{
+  	    ex_pressedreturn = TRUE;
+  	    goto doend;
+*** ../vim-7.1.156/src/version.c	Sun Nov 11 19:16:44 2007
+--- src/version.c	Tue Nov 20 12:28:22 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     157,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+119. You are reading a book and look for the scroll bar to get to
+     the next page.
+
+ /// 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    ///

Added: trunk/packages/vim/upstream/patches/7.1.158
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.158?rev=1089&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.158 (added)
+++ trunk/packages/vim/upstream/patches/7.1.158 Sun Nov 25 16:33:47 2007
@@ -1,0 +1,157 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.158 (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 7.1.158 (extra)
+Problem:    Win32 console: When 'encoding' is "utf-8" and typing Alt-y the
+            result is wrong.  Win32 GUI: Alt-y results in "u" when 'encoding'
+            is "cp1250" (Lukas Cerman)
+Solution:   For utf-8 don't set the 7th bit in a byte, convert to the correct
+            byte sequence.  For cp1250, when conversion to 'encoding' results
+            in the 7th bit not set, set the 7th bit after conversion.
+Files:      src/os_win32.c, src/gui_w48.c
+
+
+*** ../vim-7.1.157/src/os_win32.c	Mon Oct  1 20:33:45 2007
+--- src/os_win32.c	Sat Oct 27 17:35:04 2007
+***************
+*** 1521,1527 ****
+--- 1521,1532 ----
+  #endif
+  		   )
+  		{
++ #ifdef FEAT_MBYTE
++ 		    n = (*mb_char2bytes)(typeahead[typeaheadlen] | 0x80,
++ 						    typeahead + typeaheadlen);
++ #else
+  		    typeahead[typeaheadlen] |= 0x80;
++ #endif
+  		    modifiers &= ~MOD_MASK_ALT;
+  		}
+  
+*** ../vim-7.1.157/src/gui_w48.c	Sun Sep 30 14:00:41 2007
+--- src/gui_w48.c	Mon Oct 29 20:00:25 2007
+***************
+*** 486,495 ****
+  
+  /*
+   * Convert Unicode character "ch" to bytes in "string[slen]".
+   * Return the length.
+   */
+      static int
+! char_to_string(int ch, char_u *string, int slen)
+  {
+      int		len;
+      int		i;
+--- 486,496 ----
+  
+  /*
+   * Convert Unicode character "ch" to bytes in "string[slen]".
++  * When "had_alt" is TRUE the ALT key was included in "ch".
+   * Return the length.
+   */
+      static int
+! char_to_string(int ch, char_u *string, int slen, int had_alt)
+  {
+      int		len;
+      int		i;
+***************
+*** 522,529 ****
+--- 523,544 ----
+  	 * "enc_codepage" is non-zero use the standard Win32 function,
+  	 * otherwise use our own conversion function (e.g., for UTF-8). */
+  	if (enc_codepage > 0)
++ 	{
+  	    len = WideCharToMultiByte(enc_codepage, 0, wstring, len,
+  						       string, slen, 0, NULL);
++ 	    /* If we had included the ALT key into the character but now the
++ 	     * upper bit is no longer set, that probably means the conversion
++ 	     * failed.  Convert the original character and set the upper bit
++ 	     * afterwards. */
++ 	    if (had_alt && len == 1 && ch >= 0x80 && string[0] < 0x80)
++ 	    {
++ 		wstring[0] = ch & 0x7f;
++ 		len = WideCharToMultiByte(enc_codepage, 0, wstring, len,
++ 						       string, slen, 0, NULL);
++ 		if (len == 1) /* safety check */
++ 		    string[0] |= 0x80;
++ 	    }
++ 	}
+  	else
+  	{
+  	    len = 1;
+***************
+*** 573,579 ****
+      char_u	string[40];
+      int		len = 0;
+  
+!     len = char_to_string(ch, string, 40);
+      if (len == 1 && string[0] == Ctrl_C && ctrl_c_interrupts)
+      {
+  	trash_input_buf();
+--- 588,594 ----
+      char_u	string[40];
+      int		len = 0;
+  
+!     len = char_to_string(ch, string, 40, FALSE);
+      if (len == 1 && string[0] == Ctrl_C && ctrl_c_interrupts)
+      {
+  	trash_input_buf();
+***************
+*** 640,646 ****
+      {
+  	/* Although the documentation isn't clear about it, we assume "ch" is
+  	 * a Unicode character. */
+! 	len += char_to_string(ch, string + len, 40 - len);
+      }
+  
+      add_to_input_buf(string, len);
+--- 655,661 ----
+      {
+  	/* Although the documentation isn't clear about it, we assume "ch" is
+  	 * a Unicode character. */
+! 	len += char_to_string(ch, string + len, 40 - len, TRUE);
+      }
+  
+      add_to_input_buf(string, len);
+***************
+*** 1775,1781 ****
+  		    int	len;
+  
+  		    /* Handle "key" as a Unicode character. */
+! 		    len = char_to_string(key, string, 40);
+  		    add_to_input_buf(string, len);
+  		}
+  		break;
+--- 1790,1796 ----
+  		    int	len;
+  
+  		    /* Handle "key" as a Unicode character. */
+! 		    len = char_to_string(key, string, 40, FALSE);
+  		    add_to_input_buf(string, len);
+  		}
+  		break;
+*** ../vim-7.1.157/src/version.c	Tue Nov 20 12:30:31 2007
+--- src/version.c	Tue Nov 20 17:19:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     158,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+123. You ask the car dealer to install an extra cigarette lighter
+     on your new car to power your notebook.
+
+ /// 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    ///

Added: trunk/packages/vim/upstream/patches/7.1.159
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.159?rev=1089&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.159 (added)
+++ trunk/packages/vim/upstream/patches/7.1.159 Sun Nov 25 16:33:47 2007
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.159
+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.159
+Problem:    strcpy() has overlapping arguments.
+Solution:   Use mch_memmove() instead. (Dominique Pelle)
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-7.1.158/src/ex_cmds.c	Thu Nov  8 20:47:34 2007
+--- src/ex_cmds.c	Sun Nov 18 14:11:58 2007
+***************
+*** 4885,4891 ****
+  			    ++line2;
+  			    /* move the cursor to the new line, like Vi */
+  			    ++curwin->w_cursor.lnum;
+! 			    STRCPY(new_start, p1 + 1);	/* copy the rest */
+  			    p1 = new_start - 1;
+  			}
+  		    }
+--- 4885,4892 ----
+  			    ++line2;
+  			    /* move the cursor to the new line, like Vi */
+  			    ++curwin->w_cursor.lnum;
+! 			    /* copy the rest */
+! 			    mch_memmove(new_start, p1 + 1, STRLEN(p1 + 1) + 1);
+  			    p1 = new_start - 1;
+  			}
+  		    }
+*** ../vim-7.1.158/src/version.c	Tue Nov 20 17:21:28 2007
+--- src/version.c	Tue Nov 20 18:01:45 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     159,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+125. You begin to wonder how often it REALLY is necessary to get up
+     and shower or bathe.
+
+ /// 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    ///

Added: trunk/packages/vim/upstream/patches/7.1.160
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.160?rev=1089&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.160 (added)
+++ trunk/packages/vim/upstream/patches/7.1.160 Sun Nov 25 16:33:47 2007
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.160
+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.160
+Problem:    When a focus autocommand is defined, getting or losing focus
+	    causes the hit-enter prompt to be redrawn. (Bjorn Winckler)
+Solution:   Overwrite the last line.
+Files:	    src/message.c
+
+
+*** ../vim-7.1.159/src/message.c	Thu Sep 13 22:04:30 2007
+--- src/message.c	Sun Nov  4 17:33:15 2007
+***************
+*** 2850,2855 ****
+--- 2850,2864 ----
+      }
+      else if (State == HITRETURN || State == SETWSIZE)
+      {
++ 	if (msg_row == Rows - 1)
++ 	{
++ 	    /* Avoid drawing the "hit-enter" prompt below the previous one,
++ 	     * overwrite it.  Esp. useful when regaining focus and a
++ 	     * FocusGained autocmd exists but didn't draw anything. */
++ 	    msg_didout = FALSE;
++ 	    msg_col = 0;
++ 	    msg_clr_eos();
++ 	}
+  	hit_return_msg();
+  	msg_row = Rows - 1;
+      }
+*** ../vim-7.1.159/src/version.c	Tue Nov 20 18:03:34 2007
+--- src/version.c	Sat Nov 24 15:41:43 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     160,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+142. You dream about creating the world's greatest web site.
+
+ /// 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    ///

Added: trunk/packages/vim/upstream/patches/7.1.161
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.161?rev=1089&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.161 (added)
+++ trunk/packages/vim/upstream/patches/7.1.161 Sun Nov 25 16:33:47 2007
@@ -1,0 +1,176 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.161
+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.161
+Problem:    Compilation errors with tiny features and EXITFREE.
+Solution:   Add #ifdefs. (Dominique Pelle)
+Files:	    src/edit.c, src/misc2.c
+
+
+*** ../vim-7.1.160/src/edit.c	Thu Nov  8 13:03:33 2007
+--- src/edit.c	Sat Nov 24 14:57:46 2007
+***************
+*** 2236,2242 ****
+  	    while (i < actual_len && (p - IObuff + 6) < IOSIZE)
+  #ifdef FEAT_MBYTE
+  		if (has_mbyte)
+! 		    p += mb_char2bytes(wca[i++], p);
+  		else
+  #endif
+  		    *(p++) = wca[i++];
+--- 2236,2242 ----
+  	    while (i < actual_len && (p - IObuff + 6) < IOSIZE)
+  #ifdef FEAT_MBYTE
+  		if (has_mbyte)
+! 		    p += (*mb_char2bytes)(wca[i++], p);
+  		else
+  #endif
+  		    *(p++) = wca[i++];
+***************
+*** 6444,6451 ****
+--- 6444,6453 ----
+  {
+      vim_free(last_insert);
+      last_insert = NULL;
++ # ifdef FEAT_INS_EXPAND
+      vim_free(compl_orig_text);
+      compl_orig_text = NULL;
++ # endif
+  }
+  #endif
+  
+*** ../vim-7.1.160/src/misc2.c	Thu Nov  8 20:47:34 2007
+--- src/misc2.c	Sat Nov 24 15:01:46 2007
+***************
+*** 964,970 ****
+  {
+      buf_T	*buf, *nextbuf;
+      static int	entered = FALSE;
+-     win_T	*win;
+  
+      /* When we cause a crash here it is caught and Vim tries to exit cleanly.
+       * Don't try freeing everything again. */
+--- 965,970 ----
+***************
+*** 972,986 ****
+  	return;
+      entered = TRUE;
+  
+      block_autocmds();	    /* don't want to trigger autocommands here */
+  
+! #ifdef FEAT_WINDOWS
+      /* close all tabs and windows */
+      if (first_tabpage->tp_next != NULL)
+  	do_cmdline_cmd((char_u *)"tabonly!");
+      if (firstwin != lastwin)
+  	do_cmdline_cmd((char_u *)"only!");
+! #endif
+  
+  # if defined(FEAT_SPELL)
+      /* Free all spell info. */
+--- 972,988 ----
+  	return;
+      entered = TRUE;
+  
++ # ifdef FEAT_AUTOCMD
+      block_autocmds();	    /* don't want to trigger autocommands here */
++ # endif
+  
+! # ifdef FEAT_WINDOWS
+      /* close all tabs and windows */
+      if (first_tabpage->tp_next != NULL)
+  	do_cmdline_cmd((char_u *)"tabonly!");
+      if (firstwin != lastwin)
+  	do_cmdline_cmd((char_u *)"only!");
+! # endif
+  
+  # if defined(FEAT_SPELL)
+      /* Free all spell info. */
+***************
+*** 1031,1038 ****
+--- 1033,1044 ----
+      free_regexp_stuff();
+      free_tag_stuff();
+      free_cd_dir();
++ # ifdef FEAT_EVAL
+      set_expr_line(NULL);
++ # endif
++ # ifdef FEAT_DIFF
+      diff_clear(curtab);
++ # endif
+      clear_sb_text();	      /* free any scrollback text */
+  
+      /* Free some global vars. */
+***************
+*** 1041,1059 ****
+      vim_free(clip_exclude_prog);
+  # endif
+      vim_free(last_cmdline);
+      vim_free(new_last_cmdline);
+      set_keep_msg(NULL, 0);
+      vim_free(ff_expand_buffer);
+  
+      /* Clear cmdline history. */
+      p_hi = 0;
+      init_history();
+  
+  #ifdef FEAT_QUICKFIX
+!     qf_free_all(NULL);
+!     /* Free all location lists */
+!     FOR_ALL_WINDOWS(win)
+! 	qf_free_all(win);
+  #endif
+  
+      /* Close all script inputs. */
+--- 1047,1073 ----
+      vim_free(clip_exclude_prog);
+  # endif
+      vim_free(last_cmdline);
++ # ifdef FEAT_CMDHIST
+      vim_free(new_last_cmdline);
++ # endif
+      set_keep_msg(NULL, 0);
+      vim_free(ff_expand_buffer);
+  
+      /* Clear cmdline history. */
+      p_hi = 0;
++ # ifdef FEAT_CMDHIST
+      init_history();
++ # endif
+  
+  #ifdef FEAT_QUICKFIX
+!     {
+! 	win_T	*win;
+! 
+! 	qf_free_all(NULL);
+! 	/* Free all location lists */
+! 	FOR_ALL_WINDOWS(win)
+! 	    qf_free_all(win);
+!     }
+  #endif
+  
+      /* Close all script inputs. */
+*** ../vim-7.1.160/src/version.c	Sat Nov 24 15:44:17 2007
+--- src/version.c	Sat Nov 24 20:55:38 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     161,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+143. You dream in pallettes of 216 websafe colors.
+
+ /// 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