SOURCES: 7.1.286 (NEW), 7.1.287 (NEW), 7.1.288 (NEW), 7.1.289 (NEW...

glen glen at pld-linux.org
Mon Apr 7 10:45:08 CEST 2008


Author: glen                         Date: Mon Apr  7 08:45:07 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from upstream

---- Files affected:
SOURCES:
   7.1.286 (NONE -> 1.1)  (NEW), 7.1.287 (NONE -> 1.1)  (NEW), 7.1.288 (NONE -> 1.1)  (NEW), 7.1.289 (NONE -> 1.1)  (NEW), 7.1.290 (NONE -> 1.1)  (NEW), 7.1.291 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/7.1.286
diff -u /dev/null SOURCES/7.1.286:1.1
--- /dev/null	Mon Apr  7 10:45:07 2008
+++ SOURCES/7.1.286	Mon Apr  7 10:45:02 2008
@@ -0,0 +1,66 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.286
+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.286 (after 7.1.103)
+Problem:    "w" at the end of the buffer moves the cursor past the end of the
+	    line. (Markus Heidelberg)
+Solution:   Move the cursor back from the NUL when it was moved forward.
+Files:	    src/normal.c
+
+
+*** ../vim-7.1.285/src/normal.c	Sat Jan 19 15:55:51 2008
+--- src/normal.c	Wed Mar 19 20:33:44 2008
+***************
+*** 8345,8350 ****
+--- 8345,8351 ----
+      int		n;
+      int		word_end;
+      int		flag = FALSE;
++     pos_T	startpos = curwin->w_cursor;
+  
+      /*
+       * Set inclusive for the "E" and "e" command.
+***************
+*** 8405,8412 ****
+      else
+  	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
+  
+!     /* Don't leave the cursor on the NUL past the end of line. */
+!     if (n != FAIL)
+  	adjust_cursor(cap->oap);
+  
+      if (n == FAIL && cap->oap->op_type == OP_NOP)
+--- 8406,8414 ----
+      else
+  	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
+  
+!     /* Don't leave the cursor on the NUL past the end of line. Unless we
+!      * didn't move it forward. */
+!     if (lt(startpos, curwin->w_cursor))
+  	adjust_cursor(cap->oap);
+  
+      if (n == FAIL && cap->oap->op_type == OP_NOP)
+*** ../vim-7.1.285/src/version.c	Thu Mar 20 14:38:58 2008
+--- src/version.c	Tue Apr  1 12:04:54 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     286,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+200. You really believe in the concept of a "paperless" office.
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.287
diff -u /dev/null SOURCES/7.1.287:1.1
--- /dev/null	Mon Apr  7 10:45:08 2008
+++ SOURCES/7.1.287	Mon Apr  7 10:45:02 2008
@@ -0,0 +1,62 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.287
+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.287
+Problem:    Crash when reversing a list after using it. (Andy Wokula)
+Solution:   Update the pointer to the last used element. (Dominique Pelle)
+Files:	    src/eval.c
+
+
+*** ../vim-7.1.286/src/eval.c	Thu Mar 20 13:22:47 2008
+--- src/eval.c	Tue Apr  1 12:36:41 2008
+***************
+*** 13954,13959 ****
+--- 13954,13960 ----
+  	rettv->vval.v_list = l;
+  	rettv->v_type = VAR_LIST;
+  	++l->lv_refcount;
++ 	l->lv_idx = l->lv_len - l->lv_idx - 1;
+      }
+  }
+  
+***************
+*** 15202,15208 ****
+  	    if (!item_compare_func_err)
+  	    {
+  		/* Clear the List and append the items in the sorted order. */
+! 		l->lv_first = l->lv_last = NULL;
+  		l->lv_len = 0;
+  		for (i = 0; i < len; ++i)
+  		    list_append(l, ptrs[i]);
+--- 15203,15209 ----
+  	    if (!item_compare_func_err)
+  	    {
+  		/* Clear the List and append the items in the sorted order. */
+! 		l->lv_first = l->lv_last = l->lv_idx_item = NULL;
+  		l->lv_len = 0;
+  		for (i = 0; i < len; ++i)
+  		    list_append(l, ptrs[i]);
+*** ../vim-7.1.286/src/version.c	Tue Apr  1 12:05:49 2008
+--- src/version.c	Tue Apr  1 13:09:10 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     287,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+203. You're an active member of more than 20 newsgroups.
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.288
diff -u /dev/null SOURCES/7.1.288:1.1
--- /dev/null	Mon Apr  7 10:45:08 2008
+++ SOURCES/7.1.288	Mon Apr  7 10:45:02 2008
@@ -0,0 +1,117 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.288
+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.288 (after 7.1.281)
+Problem:    Cscope still leaves behind temp files when using gvim.
+Solution:   When getting the ECHILD error loop for a while until cscope exits.
+	    (Dominique Pelle)
+Files:	    if_cscope.c
+
+
+*** ../vim-7.1.287/src/if_cscope.c	Sun Mar 16 16:02:47 2008
+--- src/if_cscope.c	Tue Mar 25 21:34:23 2008
+***************
+*** 2130,2135 ****
+--- 2130,2136 ----
+      }
+  #if defined(UNIX)
+      {
++ 	int waitpid_errno;
+  	int pstat;
+  	pid_t pid;
+  
+***************
+*** 2145,2150 ****
+--- 2146,2152 ----
+  
+  	/* Block until cscope exits or until timer expires */
+  	pid = waitpid(csinfo[i].pid, &pstat, 0);
++ 	waitpid_errno = errno;
+  
+  	/* cancel pending alarm if still there and restore signal */
+  	alarm(0);
+***************
+*** 2158,2163 ****
+--- 2160,2166 ----
+  	for (waited = 0; waited < 40; ++waited)
+  	{
+  	    pid = waitpid(csinfo[i].pid, &pstat, WNOHANG);
++ 	    waitpid_errno = errno;
+  	    if (pid != 0)
+  		break;  /* break unless the process is still running */
+  	    mch_delay(50, FALSE); /* sleep 50 ms */
+***************
+*** 2170,2177 ****
+  	 */
+  	if (pid < 0 && csinfo[i].pid > 1)
+  	{
+! 	    kill(csinfo[i].pid, SIGKILL);
+! 	    (void)waitpid(csinfo[i].pid, &pstat, 0);
+  	}
+      }
+  #else  /* !UNIX */
+--- 2173,2212 ----
+  	 */
+  	if (pid < 0 && csinfo[i].pid > 1)
+  	{
+! # ifdef ECHILD
+! 	    int alive = TRUE;
+! 
+! 	    if (waitpid_errno == ECHILD)
+! 	    {
+! 		/*
+! 		 * When using 'vim -g', vim is forked and cscope process is
+! 		 * no longer a child process but a sibling.  So waitpid()
+! 		 * fails with errno being ECHILD (No child processes).
+! 		 * Don't send SIGKILL to cscope immediately but wait
+! 		 * (polling) for it to exit normally as result of sending
+! 		 * the "q" command, hence giving it a chance to clean up
+! 		 * its temporary files.
+! 		 */
+! 		int waited;
+! 
+! 		sleep(0);
+! 		for (waited = 0; waited < 40; ++waited)
+! 		{
+! 		    /* Check whether cscope process is still alive */
+! 		    if (kill(csinfo[i].pid, 0) != 0)
+! 		    {
+! 			alive = FALSE; /* cscope process no longer exists */
+! 			break;
+! 		    }
+! 		    mch_delay(50, FALSE); /* sleep 50ms */
+! 		}
+! 	    }
+! 	    if (alive)
+! # endif
+! 	    {
+! 		kill(csinfo[i].pid, SIGKILL);
+! 		(void)waitpid(csinfo[i].pid, &pstat, 0);
+! 	    }
+  	}
+      }
+  #else  /* !UNIX */
+*** ../vim-7.1.287/src/version.c	Tue Apr  1 13:10:45 2008
+--- src/version.c	Tue Apr  1 14:28:42 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     288,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+204. You're being audited because you mailed your tax return to the IRC.
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.289
diff -u /dev/null SOURCES/7.1.289:1.1
--- /dev/null	Mon Apr  7 10:45:08 2008
+++ SOURCES/7.1.289	Mon Apr  7 10:45:02 2008
@@ -0,0 +1,74 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.289
+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.289
+Problem:    When EXITFREE is defined and 'acd' is set freed memory is used.
+	    (Dominique Pelle)
+Solution:   Reset p_acd before freeing all buffers.
+Files:	    src/misc2.c
+
+
+*** ../vim-7.1.288/src/misc2.c	Wed Feb 20 12:22:59 2008
+--- src/misc2.c	Wed Mar 26 21:02:57 2008
+***************
+*** 751,757 ****
+  #endif
+  
+  /*
+!  * Note: if unsinged is 16 bits we can only allocate up to 64K with alloc().
+   * Use lalloc for larger blocks.
+   */
+      char_u *
+--- 752,758 ----
+  #endif
+  
+  /*
+!  * Note: if unsigned is 16 bits we can only allocate up to 64K with alloc().
+   * Use lalloc for larger blocks.
+   */
+      char_u *
+***************
+*** 1082,1088 ****
+      win_free_all();
+  #endif
+  
+!     /* Free all buffers. */
+      for (buf = firstbuf; buf != NULL; )
+      {
+  	nextbuf = buf->b_next;
+--- 1083,1093 ----
+      win_free_all();
+  #endif
+  
+!     /* Free all buffers.  Reset 'autochdir' to avoid accessing things that
+!      * were freed already. */
+! #ifdef FEAT_AUTOCHDIR
+!     p_acd = FALSE;
+! #endif
+      for (buf = firstbuf; buf != NULL; )
+      {
+  	nextbuf = buf->b_next;
+*** ../vim-7.1.288/src/version.c	Tue Apr  1 14:30:18 2008
+--- src/version.c	Tue Apr  1 14:51:06 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     289,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+207. You're given one phone call in prison and you ask them for a laptop.
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.290
diff -u /dev/null SOURCES/7.1.290:1.1
--- /dev/null	Mon Apr  7 10:45:08 2008
+++ SOURCES/7.1.290	Mon Apr  7 10:45:02 2008
@@ -0,0 +1,77 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.290
+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.290
+Problem:    Reading bytes that were not written when spell checking and a line
+	    has a very large indent.
+Solution:   Don't copy the start of the next line when it only contains
+	    spaces. (Dominique Pelle)
+Files:	    src/spell.c
+
+
+*** ../vim-7.1.289/src/spell.c	Sat Jan 19 15:55:51 2008
+--- src/spell.c	Sat Mar 29 13:00:28 2008
+***************
+*** 2268,2273 ****
+--- 2269,2276 ----
+  /*
+   * For spell checking: concatenate the start of the following line "line" into
+   * "buf", blanking-out special characters.  Copy less then "maxlen" bytes.
++  * Keep the blanks at the start of the next line, this is used in win_line()
++  * to skip those bytes if the word was OK.
+   */
+      void
+  spell_cat_line(buf, line, maxlen)
+***************
+*** 2284,2295 ****
+  
+      if (*p != NUL)
+      {
+! 	*buf = ' ';
+! 	vim_strncpy(buf + 1, line, maxlen - 2);
+! 	n = (int)(p - line);
+! 	if (n >= maxlen)
+! 	    n = maxlen - 1;
+! 	vim_memset(buf + 1, ' ', n);
+      }
+  }
+  
+--- 2287,2300 ----
+  
+      if (*p != NUL)
+      {
+! 	/* Only worth concatenating if there is something else than spaces to
+! 	 * concatenate. */
+! 	n = (int)(p - line) + 1;
+! 	if (n < maxlen - 1)
+! 	{
+! 	    vim_memset(buf, ' ', n);
+! 	    vim_strncpy(buf +  n, p, maxlen - 1 - n);
+! 	}
+      }
+  }
+  
+*** ../vim-7.1.289/src/version.c	Tue Apr  1 14:53:02 2008
+--- src/version.c	Tue Apr  1 17:05:55 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     290,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+209. Your house stinks because you haven't cleaned it in a week.
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.291
diff -u /dev/null SOURCES/7.1.291:1.1
--- /dev/null	Mon Apr  7 10:45:08 2008
+++ SOURCES/7.1.291	Mon Apr  7 10:45:02 2008
@@ -0,0 +1,70 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.291
+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.291 (after 7.1.288)
+Problem:    Compiler warning.
+Solution:   Change 50 to 50L.
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.1.290/src/if_cscope.c	Tue Apr  1 14:30:18 2008
+--- src/if_cscope.c	Tue Apr  1 20:56:02 2008
+***************
+*** 2163,2169 ****
+  	    waitpid_errno = errno;
+  	    if (pid != 0)
+  		break;  /* break unless the process is still running */
+! 	    mch_delay(50, FALSE); /* sleep 50 ms */
+  	}
+  # endif
+  	/*
+--- 2163,2169 ----
+  	    waitpid_errno = errno;
+  	    if (pid != 0)
+  		break;  /* break unless the process is still running */
+! 	    mch_delay(50L, FALSE); /* sleep 50 ms */
+  	}
+  # endif
+  	/*
+***************
+*** 2198,2204 ****
+  			alive = FALSE; /* cscope process no longer exists */
+  			break;
+  		    }
+! 		    mch_delay(50, FALSE); /* sleep 50ms */
+  		}
+  	    }
+  	    if (alive)
+--- 2198,2204 ----
+  			alive = FALSE; /* cscope process no longer exists */
+  			break;
+  		    }
+! 		    mch_delay(50L, FALSE); /* sleep 50ms */
+  		}
+  	    }
+  	    if (alive)
+*** ../vim-7.1.290/src/version.c	Tue Apr  1 17:13:54 2008
+--- src/version.c	Tue Apr  1 20:58:11 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     291,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+210. When you get a divorce, you don't care about who gets the children,
+     but discuss endlessly who can use the email address.
+
+ /// 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 pld-cvs-commit mailing list