r1222 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.263 upstream/patches/7.1.264 upstream/patches/7.1.265

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Tue Feb 26 21:07:18 UTC 2008


Author: jamessan
Date: Tue Feb 26 21:07:16 2008
New Revision: 1222

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1222
Log:
* New upstream patches (246 - 265), 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)

Added:
    trunk/packages/vim/upstream/patches/7.1.263
    trunk/packages/vim/upstream/patches/7.1.264
    trunk/packages/vim/upstream/patches/7.1.265
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=1222&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Feb 26 21:07:16 2008
@@ -290,6 +290,10 @@
  50921  7.1.256  findfile() also returns directories
   3326  7.1.257  configure can't always find the Tcl header files
   3360  7.1.258  crash when doing "d/\n/e" and 'virtualedit' is "all"
+  1944  7.1.259  cursor in wrong place with 'rl', "utf-8" and illegal byte
   1805  7.1.260  cursor position wrong after ^@ wrapping halfway if using utf-8
   2255  7.1.261  for a 2 byte BOM UCS-2 is used, which doesn't work for UTF-16
   3438  7.1.262  can't get the process ID of Vim
+  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'

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1222&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Feb 26 21:07:16 2008
@@ -1,7 +1,9 @@
-vim (1:7.1-262+1) UNRELEASED; urgency=low
+vim (1:7.1-265+1) UNRELEASED; urgency=low
 
   [ James Vega ]
-  * New upstream patches (246 - 262), see README.gz for details.
+  * New upstream patches (246 - 265), 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)
   * debian/control:
     - Build-Depend on tcl-dev instead of tcl8.4-dev per Tcl/Tk policy.
   * Added patches:

Added: trunk/packages/vim/upstream/patches/7.1.263
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.263?rev=1222&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.263 (added)
+++ trunk/packages/vim/upstream/patches/7.1.263 Tue Feb 26 21:07:16 2008
@@ -1,0 +1,84 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.263
+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.263
+Problem:    The filetype can consist of two dot separated names.  This works
+	    for syntax and ftplugin, but not for indent. (Brett Stahlman)
+Solution:   Use split() and loop over each dot separated name.
+Files:	    runtime/indent.vim
+
+
+*** ../vim-7.1.262/runtime/indent.vim	Mon Mar 28 22:56:55 2005
+--- runtime/indent.vim	Fri Feb 22 21:05:39 2008
+***************
+*** 1,7 ****
+  " Vim support file to switch on loading indent files for file types
+  "
+  " Maintainer:	Bram Moolenaar <Bram at vim.org>
+! " Last Change:	2005 Mar 28
+  
+  if exists("did_indent_on")
+    finish
+--- 1,7 ----
+  " Vim support file to switch on loading indent files for file types
+  "
+  " Maintainer:	Bram Moolenaar <Bram at vim.org>
+! " Last Change:	2008 Feb 22
+  
+  if exists("did_indent_on")
+    finish
+***************
+*** 15,25 ****
+        exe b:undo_indent
+        unlet! b:undo_indent b:did_indent
+      endif
+!     if expand("<amatch>") != ""
+        if exists("b:did_indent")
+  	unlet b:did_indent
+        endif
+!       runtime! indent/<amatch>.vim
+      endif
+    endfunc
+  augroup END
+--- 15,31 ----
+        exe b:undo_indent
+        unlet! b:undo_indent b:did_indent
+      endif
+!     let s = expand("<amatch>")
+!     if s != ""
+        if exists("b:did_indent")
+  	unlet b:did_indent
+        endif
+! 
+!       " When there is a dot it is used to separate filetype names.  Thus for
+!       " "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim".
+!       for name in split(s, '\.')
+! 	exe 'runtime! indent/' . name . '.vim'
+!       endfor
+      endif
+    endfunc
+  augroup END
+*** ../vim-7.1.262/src/version.c	Wed Feb 20 20:09:44 2008
+--- src/version.c	Mon Feb 25 20:44:04 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     263,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
+
+ /// 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.264
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.264?rev=1222&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.264 (added)
+++ trunk/packages/vim/upstream/patches/7.1.264 Tue Feb 26 21:07:16 2008
@@ -1,0 +1,237 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.264
+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.264
+Problem:    Crash when indenting lines. (Dominique Pelle)
+Solution:   Set the cursor column when changing the cursor line.
+Files:	    src/ops.c, src/misc1.c
+
+
+*** ../vim-7.1.263/src/ops.c	Wed Feb  6 14:43:50 2008
+--- src/ops.c	Sun Feb 24 14:56:38 2008
+***************
+*** 692,697 ****
+--- 692,698 ----
+  	    }
+  	}
+  	++curwin->w_cursor.lnum;
++ 	curwin->w_cursor.col = 0;  /* make sure it's valid */
+      }
+  
+      /* put cursor on first non-blank of indented line */
+*** ../vim-7.1.263/src/misc1.c	Wed Feb 13 10:57:11 2008
+--- src/misc1.c	Sun Feb 24 15:04:27 2008
+***************
+*** 6894,6899 ****
+--- 6894,6900 ----
+  			if (trypos != NULL)
+  			{
+  			    curwin->w_cursor.lnum = trypos->lnum + 1;
++ 			    curwin->w_cursor.col = 0;
+  			    continue;
+  			}
+  
+***************
+*** 6954,6959 ****
+--- 6955,6961 ----
+  			    if (trypos != NULL)
+  			    {
+  				curwin->w_cursor.lnum = trypos->lnum + 1;
++ 				curwin->w_cursor.col = 0;
+  				continue;
+  			    }
+  			}
+***************
+*** 6991,6996 ****
+--- 6993,6999 ----
+  		if ((trypos = find_start_comment(ind_maxcomment)) != NULL)
+  		{
+  		    curwin->w_cursor.lnum = trypos->lnum + 1;
++ 		    curwin->w_cursor.col = 0;
+  		    continue;
+  		}
+  
+***************
+*** 7114,7120 ****
+--- 7117,7126 ----
+  		{
+  		    if (find_last_paren(l, '{', '}') && (trypos =
+  				    find_start_brace(ind_maxcomment)) != NULL)
++ 		    {
+  			curwin->w_cursor.lnum = trypos->lnum + 1;
++ 			curwin->w_cursor.col = 0;
++ 		    }
+  		    continue;
+  		}
+  
+***************
+*** 7230,7240 ****
+  			 *     case xx:  if ( asdf &&
+  			 *			asdf)
+  			 */
+! 			curwin->w_cursor.lnum = trypos->lnum;
+  			l = ml_get_curline();
+  			if (cin_iscase(l) || cin_isscopedecl(l))
+  			{
+  			    ++curwin->w_cursor.lnum;
+  			    continue;
+  			}
+  		    }
+--- 7236,7247 ----
+  			 *     case xx:  if ( asdf &&
+  			 *			asdf)
+  			 */
+! 			curwin->w_cursor = *trypos;
+  			l = ml_get_curline();
+  			if (cin_iscase(l) || cin_isscopedecl(l))
+  			{
+  			    ++curwin->w_cursor.lnum;
++ 			    curwin->w_cursor.col = 0;
+  			    continue;
+  			}
+  		    }
+***************
+*** 7254,7259 ****
+--- 7261,7267 ----
+  			    if (*l == NUL || l[STRLEN(l) - 1] != '\\')
+  				break;
+  			    --curwin->w_cursor.lnum;
++ 			    curwin->w_cursor.col = 0;
+  			}
+  		    }
+  
+***************
+*** 7587,7597 ****
+  			     *	   case xx:  if ( asdf &&
+  			     *			    asdf)
+  			     */
+! 			    curwin->w_cursor.lnum = trypos->lnum;
+  			    l = ml_get_curline();
+  			    if (cin_iscase(l) || cin_isscopedecl(l))
+  			    {
+  				++curwin->w_cursor.lnum;
+  				continue;
+  			    }
+  			}
+--- 7595,7606 ----
+  			     *	   case xx:  if ( asdf &&
+  			     *			    asdf)
+  			     */
+! 			    curwin->w_cursor = *trypos;
+  			    l = ml_get_curline();
+  			    if (cin_iscase(l) || cin_isscopedecl(l))
+  			    {
+  				++curwin->w_cursor.lnum;
++ 				curwin->w_cursor.col = 0;
+  				continue;
+  			    }
+  			}
+***************
+*** 7652,7664 ****
+  				&& (trypos = find_start_brace(ind_maxcomment))
+  							    != NULL) /* XXX */
+  			{
+! 			    curwin->w_cursor.lnum = trypos->lnum;
+  			    /* if not "else {" check for terminated again */
+  			    /* but skip block for "} else {" */
+  			    l = cin_skipcomment(ml_get_curline());
+  			    if (*l == '}' || !cin_iselse(l))
+  				goto term_again;
+  			    ++curwin->w_cursor.lnum;
+  			}
+  		    }
+  		}
+--- 7661,7674 ----
+  				&& (trypos = find_start_brace(ind_maxcomment))
+  							    != NULL) /* XXX */
+  			{
+! 			    curwin->w_cursor = *trypos;
+  			    /* if not "else {" check for terminated again */
+  			    /* but skip block for "} else {" */
+  			    l = cin_skipcomment(ml_get_curline());
+  			    if (*l == '}' || !cin_iselse(l))
+  				goto term_again;
+  			    ++curwin->w_cursor.lnum;
++ 			    curwin->w_cursor.col = 0;
+  			}
+  		    }
+  		}
+***************
+*** 7727,7732 ****
+--- 7737,7743 ----
+  		if ((trypos = find_start_comment(ind_maxcomment)) != NULL)
+  		{
+  		    curwin->w_cursor.lnum = trypos->lnum + 1;
++ 		    curwin->w_cursor.col = 0;
+  		    continue;
+  		}
+  
+***************
+*** 7777,7783 ****
+  		    if (find_last_paren(l, '(', ')')
+  			    && (trypos = find_match_paren(ind_maxparen,
+  						     ind_maxcomment)) != NULL)
+! 			curwin->w_cursor.lnum = trypos->lnum;
+  
+  		    /* For a line ending in ',' that is a continuation line go
+  		     * back to the first line with a backslash:
+--- 7788,7794 ----
+  		    if (find_last_paren(l, '(', ')')
+  			    && (trypos = find_match_paren(ind_maxparen,
+  						     ind_maxcomment)) != NULL)
+! 			curwin->w_cursor = *trypos;
+  
+  		    /* For a line ending in ',' that is a continuation line go
+  		     * back to the first line with a backslash:
+***************
+*** 7791,7796 ****
+--- 7802,7808 ----
+  			if (*l == NUL || l[STRLEN(l) - 1] != '\\')
+  			    break;
+  			--curwin->w_cursor.lnum;
++ 			curwin->w_cursor.col = 0;
+  		    }
+  
+  		    amount = get_indent();	    /* XXX */
+***************
+*** 7864,7870 ****
+  
+  		if ((trypos = find_match_paren(ind_maxparen,
+  						     ind_maxcomment)) != NULL)
+! 		    curwin->w_cursor.lnum = trypos->lnum;
+  		amount = get_indent();	    /* XXX */
+  		break;
+  	    }
+--- 7876,7882 ----
+  
+  		if ((trypos = find_match_paren(ind_maxparen,
+  						     ind_maxcomment)) != NULL)
+! 		    curwin->w_cursor = *trypos;
+  		amount = get_indent();	    /* XXX */
+  		break;
+  	    }
+*** ../vim-7.1.263/src/version.c	Mon Feb 25 20:45:46 2008
+--- src/version.c	Mon Feb 25 21:51:20 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     264,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+49. You never have to deal with busy signals when calling your ISP...because
+    you never log off.
+
+ /// 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.265
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.265?rev=1222&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.265 (added)
+++ trunk/packages/vim/upstream/patches/7.1.265 Tue Feb 26 21:07:16 2008
@@ -1,0 +1,46 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.265
+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.265
+Problem:    When 'isfname' contains a space, cmdline completion can hang.
+	    (James Vega)
+Solution:   Reset the "len" variable.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.1.264/src/ex_docmd.c	Sat Jan 19 15:55:51 2008
+--- src/ex_docmd.c	Sun Feb 24 22:09:52 2008
+***************
+*** 3346,3351 ****
+--- 3346,3352 ----
+  #endif
+  		    ))
+  	    {
++ 		len = 0;  /* avoid getting stuck when space is in 'isfname' */
+  		while (*p != NUL)
+  		{
+  #ifdef FEAT_MBYTE
+*** ../vim-7.1.264/src/version.c	Mon Feb 25 21:54:23 2008
+--- src/version.c	Tue Feb 26 21:28:25 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     265,
+  /**/
+
+-- 
+Q: What is a patch 22?
+A: A patch you need to include to make it possible to include patches.
+
+ /// 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