d11beaa
To: vim-dev@vim.org
d11beaa
Subject: Patch 7.2.094
d11beaa
Fcc: outbox
d11beaa
From: Bram Moolenaar <Bram@moolenaar.net>
d11beaa
Mime-Version: 1.0
d11beaa
Content-Type: text/plain; charset=ISO-8859-1
d11beaa
Content-Transfer-Encoding: 8bit
d11beaa
------------
d11beaa
d11beaa
Patch 7.2.094
d11beaa
Problem:    Compiler warning for signed/unsigned compare.
d11beaa
Solution:   Add type cast.  Also fix a few typos.
d11beaa
Files:	    src/edit.c
d11beaa
d11beaa
d11beaa
*** ../vim-7.2.093/src/edit.c	Tue Jan 13 12:29:03 2009
d11beaa
--- src/edit.c	Wed Jan 28 21:13:51 2009
d11beaa
***************
d11beaa
*** 1958,1963 ****
d11beaa
--- 1958,1964 ----
d11beaa
   * Only matters when there are composing characters.
d11beaa
   * Return TRUE when something was deleted.
d11beaa
   */
d11beaa
+ /*ARGSUSED*/
d11beaa
     static int
d11beaa
  del_char_after_col(limit_col)
d11beaa
      int limit_col;
d11beaa
***************
d11beaa
*** 1971,1977 ****
d11beaa
  	 * skip forward again when going too far back because of a
d11beaa
  	 * composing character. */
d11beaa
  	mb_adjust_cursor();
d11beaa
! 	while (curwin->w_cursor.col < limit_col)
d11beaa
  	{
d11beaa
  	    int l = utf_ptr2len(ml_get_cursor());
d11beaa
  
d11beaa
--- 1972,1978 ----
d11beaa
  	 * skip forward again when going too far back because of a
d11beaa
  	 * composing character. */
d11beaa
  	mb_adjust_cursor();
d11beaa
! 	while (curwin->w_cursor.col < (colnr_T)limit_col)
d11beaa
  	{
d11beaa
  	    int l = utf_ptr2len(ml_get_cursor());
d11beaa
  
d11beaa
***************
d11beaa
*** 4240,4246 ****
d11beaa
  	}
d11beaa
  
d11beaa
  	/* check if compl_curr_match has changed, (e.g. other type of
d11beaa
! 	 * expansion added somenthing) */
d11beaa
  	if (type != 0 && compl_curr_match != old_match)
d11beaa
  	    found_new_match = OK;
d11beaa
  
d11beaa
--- 4241,4247 ----
d11beaa
  	}
d11beaa
  
d11beaa
  	/* check if compl_curr_match has changed, (e.g. other type of
d11beaa
! 	 * expansion added something) */
d11beaa
  	if (type != 0 && compl_curr_match != old_match)
d11beaa
  	    found_new_match = OK;
d11beaa
  
d11beaa
***************
d11beaa
*** 4741,4747 ****
d11beaa
  		}
d11beaa
  		compl_length = curwin->w_cursor.col - (int)compl_col;
d11beaa
  		/* IObuff is used to add a "word from the next line" would we
d11beaa
! 		 * have enough space?  just being paranoic */
d11beaa
  #define	MIN_SPACE 75
d11beaa
  		if (compl_length > (IOSIZE - MIN_SPACE))
d11beaa
  		{
d11beaa
--- 4742,4748 ----
d11beaa
  		}
d11beaa
  		compl_length = curwin->w_cursor.col - (int)compl_col;
d11beaa
  		/* IObuff is used to add a "word from the next line" would we
d11beaa
! 		 * have enough space?  just being paranoid */
d11beaa
  #define	MIN_SPACE 75
d11beaa
  		if (compl_length > (IOSIZE - MIN_SPACE))
d11beaa
  		{
d11beaa
***************
d11beaa
*** 8206,8212 ****
d11beaa
  /*
d11beaa
   * If the cursor is on an indent, ^T/^D insert/delete one
d11beaa
   * shiftwidth.	Otherwise ^T/^D behave like a "<<" or ">>".
d11beaa
!  * Always round the indent to 'shiftwith', this is compatible
d11beaa
   * with vi.  But vi only supports ^T and ^D after an
d11beaa
   * autoindent, we support it everywhere.
d11beaa
   */
d11beaa
--- 8207,8213 ----
d11beaa
  /*
d11beaa
   * If the cursor is on an indent, ^T/^D insert/delete one
d11beaa
   * shiftwidth.	Otherwise ^T/^D behave like a "<<" or ">>".
d11beaa
!  * Always round the indent to 'shiftwidth', this is compatible
d11beaa
   * with vi.  But vi only supports ^T and ^D after an
d11beaa
   * autoindent, we support it everywhere.
d11beaa
   */
d11beaa
*** ../vim-7.2.093/src/version.c	Wed Jan 28 21:22:20 2009
d11beaa
--- src/version.c	Wed Feb  4 11:17:02 2009
d11beaa
***************
d11beaa
*** 678,679 ****
d11beaa
--- 678,681 ----
d11beaa
  {   /* Add new patch number below this line */
d11beaa
+ /**/
d11beaa
+     94,
d11beaa
  /**/
d11beaa
d11beaa
-- 
d11beaa
Despite the cost of living, have you noticed how it remains so popular?
d11beaa
d11beaa
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
d11beaa
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
d11beaa
\\\        download, build and distribute -- http://www.A-A-P.org        ///
d11beaa
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///