packages: vim/vim.spec, vim/7.3.082 (NEW), vim/7.3.083 (NEW), vim/7.3.084 (...

glen glen at pld-linux.org
Mon Dec 27 15:48:19 CET 2010


Author: glen                         Date: Mon Dec 27 14:48:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 7.3.089

---- Files affected:
packages/vim:
   vim.spec (1.536 -> 1.537) , 7.3.082 (NONE -> 1.1)  (NEW), 7.3.083 (NONE -> 1.1)  (NEW), 7.3.084 (NONE -> 1.1)  (NEW), 7.3.085 (NONE -> 1.1)  (NEW), 7.3.086 (NONE -> 1.1)  (NEW), 7.3.087 (NONE -> 1.1)  (NEW), 7.3.088 (NONE -> 1.1)  (NEW), 7.3.089 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.536 packages/vim/vim.spec:1.537
--- packages/vim/vim.spec:1.536	Thu Dec  9 12:18:54 2010
+++ packages/vim/vim.spec	Mon Dec 27 15:48:13 2010
@@ -28,7 +28,7 @@
 # curl -s ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS | grep -vF .gz | tail -n1 | awk '{print $2}'
 
 %define		ver		7.3
-%define		patchlevel	081
+%define		patchlevel	089
 %define		rel			1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
@@ -1380,6 +1380,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.537  2010/12/27 14:48:13  glen
+- 7.3.089
+
 Revision 1.536  2010/12/09 11:18:54  glen
 - (auto)up to 7.3.081
 

================================================================
Index: packages/vim/7.3.082
diff -u /dev/null packages/vim/7.3.082:1.1
--- /dev/null	Mon Dec 27 15:48:19 2010
+++ packages/vim/7.3.082	Mon Dec 27 15:48:13 2010
@@ -0,0 +1,51 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.082
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.082
+Problem:    Leaking file descriptor when hostname doesn't exist.
+Solution:   Remove old debugging lines.
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.3.081/src/netbeans.c	2010-12-08 13:11:15.000000000 +0100
+--- src/netbeans.c	2010-12-17 12:13:32.000000000 +0100
+***************
+*** 323,334 ****
+      server.sin_port = htons(port);
+      if ((host = gethostbyname(hostname)) == NULL)
+      {
+- 	if (mch_access(hostname, R_OK) >= 0)
+- 	{
+- 	    /* DEBUG: input file */
+- 	    sd = mch_open(hostname, O_RDONLY, 0);
+- 	    goto theend;
+- 	}
+  	nbdebug(("error in gethostbyname() in netbeans_connect()\n"));
+  	PERROR("gethostbyname() in netbeans_connect()");
+  	goto theend;
+--- 323,328 ----
+*** ../vim-7.3.081/src/version.c	2010-12-08 19:56:52.000000000 +0100
+--- src/version.c	2010-12-17 12:17:11.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     82,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+1. At lunch time, sit in your parked car with sunglasses on and point
+   a hair dryer at passing cars. See if they slow down.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.083
diff -u /dev/null packages/vim/7.3.083:1.1
--- /dev/null	Mon Dec 27 15:48:19 2010
+++ packages/vim/7.3.083	Mon Dec 27 15:48:13 2010
@@ -0,0 +1,362 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.083
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.083
+Problem:    When a read() or write() is interrupted by a signal it fails.
+Solution:   Add read_eintr() and write_eintr().
+Files:	    src/fileio.c, src/proto/fileio.pro, src/memfile.c, src/memline.c,
+	    src/os_unix.c, src/undo.c, src/vim.h
+
+
+*** ../vim-7.3.082/src/fileio.c	2010-08-15 21:57:26.000000000 +0200
+--- src/fileio.c	2010-12-17 16:04:30.000000000 +0100
+***************
+*** 918,924 ****
+  	    {
+  		/* Read the first line (and a bit more).  Immediately rewind to
+  		 * the start of the file.  If the read() fails "len" is -1. */
+! 		len = vim_read(fd, firstline, 80);
+  		lseek(fd, (off_t)0L, SEEK_SET);
+  		for (p = firstline; p < firstline + len; ++p)
+  		    if (*p >= 0x80)
+--- 918,924 ----
+  	    {
+  		/* Read the first line (and a bit more).  Immediately rewind to
+  		 * the start of the file.  If the read() fails "len" is -1. */
+! 		len = read_eintr(fd, firstline, 80);
+  		lseek(fd, (off_t)0L, SEEK_SET);
+  		for (p = firstline; p < firstline + len; ++p)
+  		    if (*p >= 0x80)
+***************
+*** 1373,1379 ****
+  		    /*
+  		     * Read bytes from the file.
+  		     */
+! 		    size = vim_read(fd, ptr, size);
+  		}
+  
+  		if (size <= 0)
+--- 1373,1379 ----
+  		    /*
+  		     * Read bytes from the file.
+  		     */
+! 		    size = read_eintr(fd, ptr, size);
+  		}
+  
+  		if (size <= 0)
+***************
+*** 4000,4006 ****
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = vim_read(fd, copybuf,
+  								BUFSIZE)) > 0)
+  			{
+  			    if (buf_write_bytes(&write_info) == FAIL)
+--- 4000,4006 ----
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = read_eintr(fd, copybuf,
+  								BUFSIZE)) > 0)
+  			{
+  			    if (buf_write_bytes(&write_info) == FAIL)
+***************
+*** 4813,4819 ****
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = vim_read(fd, smallbuf,
+  						      SMBUFSIZE)) > 0)
+  			    if (buf_write_bytes(&write_info) == FAIL)
+  				break;
+--- 4813,4819 ----
+  #ifdef HAS_BW_FLAGS
+  			write_info.bw_flags = FIO_NOCONVERT;
+  #endif
+! 			while ((write_info.bw_len = read_eintr(fd, smallbuf,
+  						      SMBUFSIZE)) > 0)
+  			    if (buf_write_bytes(&write_info) == FAIL)
+  				break;
+***************
+*** 5330,5336 ****
+  
+  /*
+   * Call write() to write a number of bytes to the file.
+!  * Also handles encryption and 'encoding' conversion.
+   *
+   * Return FAIL for failure, OK otherwise.
+   */
+--- 5330,5336 ----
+  
+  /*
+   * Call write() to write a number of bytes to the file.
+!  * Handles encryption and 'encoding' conversion.
+   *
+   * Return FAIL for failure, OK otherwise.
+   */
+***************
+*** 5702,5717 ****
+  	crypt_encode(buf, len, buf);
+  #endif
+  
+!     /* Repeat the write(), it may be interrupted by a signal. */
+!     while (len > 0)
+!     {
+! 	wlen = vim_write(ip->bw_fd, buf, len);
+! 	if (wlen <= 0)		    /* error! */
+! 	    return FAIL;
+! 	len -= wlen;
+! 	buf += wlen;
+!     }
+!     return OK;
+  }
+  
+  #ifdef FEAT_MBYTE
+--- 5702,5709 ----
+  	crypt_encode(buf, len, buf);
+  #endif
+  
+!     wlen = write_eintr(ip->bw_fd, buf, len);
+!     return (wlen < len) ? FAIL : OK;
+  }
+  
+  #ifdef FEAT_MBYTE
+***************
+*** 6662,6669 ****
+  	return -1;
+      }
+  
+!     while ((n = vim_read(fd_in, buffer, BUFSIZE)) > 0)
+! 	if (vim_write(fd_out, buffer, n) != n)
+  	{
+  	    errmsg = _("E208: Error writing to \"%s\"");
+  	    break;
+--- 6654,6661 ----
+  	return -1;
+      }
+  
+!     while ((n = read_eintr(fd_in, buffer, BUFSIZE)) > 0)
+! 	if (write_eintr(fd_out, buffer, n) != n)
+  	{
+  	    errmsg = _("E208: Error writing to \"%s\"");
+  	    break;
+***************
+*** 10304,10306 ****
+--- 10296,10350 ----
+      }
+      return reg_pat;
+  }
++ 
++ #if defined(EINTR) || defined(PROTO)
++ /*
++  * Version of read() that retries when interrupted by EINTR (possibly
++  * by a SIGWINCH).
++  */
++     long
++ read_eintr(fd, buf, bufsize)
++     int	    fd;
++     void    *buf;
++     size_t  bufsize;
++ {
++     long ret;
++ 
++     for (;;)
++     {
++ 	ret = vim_read(fd, buf, bufsize);
++ 	if (ret >= 0 || errno != EINTR)
++ 	    break;
++     }
++     return ret;
++ }
++ 
++ /*
++  * Version of write() that retries when interrupted by EINTR (possibly
++  * by a SIGWINCH).
++  */
++     long
++ write_eintr(fd, buf, bufsize)
++     int	    fd;
++     void    *buf;
++     size_t  bufsize;
++ {
++     long    ret = 0;
++     long    wlen;
++ 
++     /* Repeat the write() so long it didn't fail, other than being interrupted
++      * by a signal. */
++     while (ret < (long)bufsize)
++     {
++ 	wlen = vim_write(fd, buf + ret, bufsize - ret);
++ 	if (wlen < 0)
++ 	{
++ 	    if (errno != EINTR)
++ 		break;
++ 	}
++ 	else
++ 	    ret += wlen;
++     }
++     return ret;
++ }
++ #endif
+*** ../vim-7.3.082/src/proto/fileio.pro	2010-08-15 21:57:28.000000000 +0200
+--- src/proto/fileio.pro	2010-12-17 15:01:26.000000000 +0100
+***************
+*** 54,57 ****
+--- 54,59 ----
+  int match_file_pat __ARGS((char_u *pattern, regprog_T *prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs));
+  int match_file_list __ARGS((char_u *list, char_u *sfname, char_u *ffname));
+  char_u *file_pat_to_reg_pat __ARGS((char_u *pat, char_u *pat_end, char *allow_dirs, int no_bslash));
++ long read_eintr __ARGS((int fd, void *buf, size_t bufsize));
++ long write_eintr __ARGS((int fd, void *buf, size_t bufsize));
+  /* vim: set ft=c : */
+*** ../vim-7.3.082/src/memfile.c	2010-08-15 21:57:25.000000000 +0200
+--- src/memfile.c	2010-12-17 16:02:54.000000000 +0100
+***************
+*** 1049,1055 ****
+  	PERROR(_("E294: Seek error in swap file read"));
+  	return FAIL;
+      }
+!     if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size)
+      {
+  	PERROR(_("E295: Read error in swap file"));
+  	return FAIL;
+--- 1049,1055 ----
+  	PERROR(_("E294: Seek error in swap file read"));
+  	return FAIL;
+      }
+!     if ((unsigned)read_eintr(mfp->mf_fd, hp->bh_data, size) != size)
+      {
+  	PERROR(_("E295: Read error in swap file"));
+  	return FAIL;
+***************
+*** 1168,1174 ****
+      }
+  #endif
+  
+!     if ((unsigned)vim_write(mfp->mf_fd, data, size) != size)
+  	result = FAIL;
+  
+  #ifdef FEAT_CRYPT
+--- 1168,1174 ----
+      }
+  #endif
+  
+!     if ((unsigned)write_eintr(mfp->mf_fd, data, size) != size)
+  	result = FAIL;
+  
+  #ifdef FEAT_CRYPT
+*** ../vim-7.3.082/src/memline.c	2010-12-08 13:16:58.000000000 +0100
+--- src/memline.c	2010-12-17 15:46:49.000000000 +0100
+***************
+*** 2062,2068 ****
+      fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+      if (fd >= 0)
+      {
+! 	if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+  	{
+  	    if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0)
+  	    {
+--- 2062,2068 ----
+      fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+      if (fd >= 0)
+      {
+! 	if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
+  	{
+  	    if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0)
+  	    {
+***************
+*** 4392,4398 ****
+  		fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+  		if (fd >= 0)
+  		{
+! 		    if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+  		    {
+  			/*
+  			 * If the swapfile has the same directory as the
+--- 4392,4398 ----
+  		fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
+  		if (fd >= 0)
+  		{
+! 		    if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
+  		    {
+  			/*
+  			 * If the swapfile has the same directory as the
+*** ../vim-7.3.082/src/os_unix.c	2010-10-20 19:17:43.000000000 +0200
+--- src/os_unix.c	2010-12-17 16:17:43.000000000 +0100
+***************
+*** 4454,4460 ****
+  		    ++noread_cnt;
+  		    while (RealWaitForChar(fromshell_fd, 10L, NULL))
+  		    {
+! 			len = read(fromshell_fd, (char *)buffer
+  # ifdef FEAT_MBYTE
+  				+ buffer_off, (size_t)(BUFLEN - buffer_off)
+  # else
+--- 4454,4460 ----
+  		    ++noread_cnt;
+  		    while (RealWaitForChar(fromshell_fd, 10L, NULL))
+  		    {
+! 			len = read_eintr(fromshell_fd, buffer
+  # ifdef FEAT_MBYTE
+  				+ buffer_off, (size_t)(BUFLEN - buffer_off)
+  # else
+*** ../vim-7.3.082/src/undo.c	2010-11-03 19:32:36.000000000 +0100
+--- src/undo.c	2010-12-17 15:39:24.000000000 +0100
+***************
+*** 1386,1392 ****
+  		char_u	mbuf[UF_START_MAGIC_LEN];
+  		int	len;
+  
+! 		len = vim_read(fd, mbuf, UF_START_MAGIC_LEN);
+  		close(fd);
+  		if (len < UF_START_MAGIC_LEN
+  		      || memcmp(mbuf, UF_START_MAGIC, UF_START_MAGIC_LEN) != 0)
+--- 1386,1392 ----
+  		char_u	mbuf[UF_START_MAGIC_LEN];
+  		int	len;
+  
+! 		len = read_eintr(fd, mbuf, UF_START_MAGIC_LEN);
+  		close(fd);
+  		if (len < UF_START_MAGIC_LEN
+  		      || memcmp(mbuf, UF_START_MAGIC, UF_START_MAGIC_LEN) != 0)
+*** ../vim-7.3.082/src/vim.h	2010-12-02 16:01:23.000000000 +0100
+--- src/vim.h	2010-12-17 14:55:04.000000000 +0100
+***************
+*** 1642,1647 ****
+--- 1642,1652 ----
+  # define USE_INPUT_BUF
+  #endif
+  
++ #ifndef EINTR
++ # define read_eintr(fd, buf, count) vim_read((fd), (buf), (count))
++ # define write_eintr(fd, buf, count) vim_write((fd), (buf), (count))
++ #endif
++ 
+  #ifdef MSWIN
+  /* On MS-Windows the third argument isn't size_t.  This matters for Win64,
+   * where sizeof(size_t)==8, not 4 */
+*** ../vim-7.3.082/src/version.c	2010-12-17 12:19:14.000000000 +0100
+--- src/version.c	2010-12-17 16:10:58.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     83,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+9. As often as possible, skip rather than walk.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.084
diff -u /dev/null packages/vim/7.3.084:1.1
--- /dev/null	Mon Dec 27 15:48:19 2010
+++ packages/vim/7.3.084	Mon Dec 27 15:48:13 2010
@@ -0,0 +1,123 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.084
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.084
+Problem:    When splitting the window, the new one scrolls with the cursor at
+	    the top.
+Solution:   Compute w_fraction before setting the new height.
+Files:	    src/window.c
+
+
+*** ../vim-7.3.083/src/window.c	2010-09-21 16:56:29.000000000 +0200
+--- src/window.c	2010-12-17 17:09:51.000000000 +0100
+***************
+*** 70,76 ****
+  #endif /* FEAT_WINDOWS */
+  
+  static win_T *win_alloc __ARGS((win_T *after, int hidden));
+! static void win_new_height __ARGS((win_T *, int));
+  
+  #define URL_SLASH	1		/* path_is_url() has found "://" */
+  #define URL_BACKSLASH	2		/* path_is_url() has found ":\\" */
+--- 70,77 ----
+  #endif /* FEAT_WINDOWS */
+  
+  static win_T *win_alloc __ARGS((win_T *after, int hidden));
+! static void set_fraction __ARGS((win_T *wp));
+! static void win_new_height __ARGS((win_T *wp, int height));
+  
+  #define URL_SLASH	1		/* path_is_url() has found "://" */
+  #define URL_BACKSLASH	2		/* path_is_url() has found ":\\" */
+***************
+*** 983,992 ****
+--- 984,999 ----
+      else
+  	frame_append(curfrp, frp);
+  
++     /* Set w_fraction now so that the cursor keeps the same relative
++      * vertical position. */
++     set_fraction(oldwin);
++     wp->w_fraction = oldwin->w_fraction;
++ 
+  #ifdef FEAT_VERTSPLIT
+      if (flags & WSP_VERT)
+      {
+  	wp->w_p_scr = curwin->w_p_scr;
++ 
+  	if (need_status)
+  	{
+  	    win_new_height(oldwin, oldwin->w_height - 1);
+***************
+*** 5453,5458 ****
+--- 5460,5478 ----
+  
+  #endif /* FEAT_WINDOWS */
+  
++ #define FRACTION_MULT	16384L
++ 
++ /*
++  * Set wp->w_fraction for the current w_wrow and w_height.
++  */
++     static void
++ set_fraction(wp)
++     win_T	*wp;
++ {
++     wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT
++ 				    + FRACTION_MULT / 2) / (long)wp->w_height;
++ }
++ 
+  /*
+   * Set the height of a window.
+   * This takes care of the things inside the window, not what happens to the
+***************
+*** 5465,5471 ****
+  {
+      linenr_T	lnum;
+      int		sline, line_size;
+- #define FRACTION_MULT	16384L
+  
+      /* Don't want a negative height.  Happens when splitting a tiny window.
+       * Will equalize heights soon to fix it. */
+--- 5485,5490 ----
+***************
+*** 5475,5482 ****
+  	return;	    /* nothing to do */
+  
+      if (wp->w_wrow != wp->w_prev_fraction_row && wp->w_height > 0)
+! 	wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT
+! 				    + FRACTION_MULT / 2) / (long)wp->w_height;
+  
+      wp->w_height = height;
+      wp->w_skipcol = 0;
+--- 5494,5500 ----
+  	return;	    /* nothing to do */
+  
+      if (wp->w_wrow != wp->w_prev_fraction_row && wp->w_height > 0)
+! 	set_fraction(wp);
+  
+      wp->w_height = height;
+      wp->w_skipcol = 0;
+*** ../vim-7.3.083/src/version.c	2010-12-17 16:27:10.000000000 +0100
+--- src/version.c	2010-12-17 17:14:19.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     84,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+12. Sing along at the opera.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.085
diff -u /dev/null packages/vim/7.3.085:1.1
--- /dev/null	Mon Dec 27 15:48:19 2010
+++ packages/vim/7.3.085	Mon Dec 27 15:48:13 2010
@@ -0,0 +1,313 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.085
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.085 (after 7.3.083)
+Problem:    Inconsistency with preproc symbols.  void * computation.
+Solution:   Include vimio.h from vim.h.  Add type cast.
+Files:      src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, src/fileio.c,
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.536&r2=1.537&f=u



More information about the pld-cvs-commit mailing list