[packages/vim.git] / 7.3.571

To: vim_dev@googlegroups.com
Subject: Patch 7.3.571
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.571
Problem:    Duplicated condition.
Solution:   Remove one. (Dominique Pelle)
Files:	    src/os_win32.c


*** ../vim-7.3.570/src/os_win32.c	2012-02-29 13:58:43.000000000 +0100
--- src/os_win32.c	2012-06-29 13:10:54.000000000 +0200
***************
*** 308,314 ****
  # ifndef GETTEXT_DLL
  #  define GETTEXT_DLL "libintl.dll"
  # endif
! /* Dummy funcitons */
  static char *null_libintl_gettext(const char *);
  static char *null_libintl_textdomain(const char *);
  static char *null_libintl_bindtextdomain(const char *, const char *);
--- 308,314 ----
  # ifndef GETTEXT_DLL
  #  define GETTEXT_DLL "libintl.dll"
  # endif
! /* Dummy functions */
  static char *null_libintl_gettext(const char *);
  static char *null_libintl_textdomain(const char *);
  static char *null_libintl_bindtextdomain(const char *, const char *);
***************
*** 1409,1415 ****
  
  
  /*
!  * mch_inchar(): low-level input funcion.
   * Get one or more characters from the keyboard or the mouse.
   * If time == 0, do not wait for characters.
   * If time == n, wait a short time for characters.
--- 1409,1415 ----
  
  
  /*
!  * mch_inchar(): low-level input function.
   * Get one or more characters from the keyboard or the mouse.
   * If time == 0, do not wait for characters.
   * If time == n, wait a short time for characters.
***************
*** 3451,3464 ****
       * to avoid to perform a blocking read */
      ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */
  			NULL,		    /* optional buffer */
! 			0,		    /* buffe size */
  			NULL,		    /* number of read bytes */
  			&availableBytes,    /* available bytes total */
  			NULL);		    /* byteLeft */
  
      repeatCount = 0;
      /* We got real data in the pipe, read it */
!     while (ret != 0 && availableBytes > 0 && availableBytes > 0)
      {
  	repeatCount++;
  	toRead =
--- 3451,3464 ----
       * to avoid to perform a blocking read */
      ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */
  			NULL,		    /* optional buffer */
! 			0,		    /* buffer size */
  			NULL,		    /* number of read bytes */
  			&availableBytes,    /* available bytes total */
  			NULL);		    /* byteLeft */
  
      repeatCount = 0;
      /* We got real data in the pipe, read it */
!     while (ret != 0 && availableBytes > 0)
      {
  	repeatCount++;
  	toRead =
***************
*** 3638,3644 ****
  		  NULL,			/* Process security attributes */
  		  NULL,			/* Thread security attributes */
  
! 		  // this command can be litigeous, handle inheritence was
  		  // deactivated for pending temp file, but, if we deactivate
  		  // it, the pipes don't work for some reason.
  		  TRUE,			/* Inherit handles, first deactivated,
--- 3638,3644 ----
  		  NULL,			/* Process security attributes */
  		  NULL,			/* Thread security attributes */
  
! 		  // this command can be litigious, handle inheritance was
  		  // deactivated for pending temp file, but, if we deactivate
  		  // it, the pipes don't work for some reason.
  		  TRUE,			/* Inherit handles, first deactivated,
*** ../vim-7.3.570/src/version.c	2012-06-29 12:57:03.000000000 +0200
--- src/version.c	2012-06-29 13:12:31.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     571,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
71. You wonder how people walk

 /// Bram Moolenaar -- Bram@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    ///
Commit	Line	Data
8bb52fd3 ER	1	To: vim_dev@googlegroups.com
	2	Subject: Patch 7.3.571
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=UTF-8
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.3.571
	11	Problem: Duplicated condition.
	12	Solution: Remove one. (Dominique Pelle)
	13	Files: src/os_win32.c
	14
	15
	16	*** ../vim-7.3.570/src/os_win32.c 2012-02-29 13:58:43.000000000 +0100
	17	--- src/os_win32.c 2012-06-29 13:10:54.000000000 +0200
	18	***************
	19	* 308,314 **
	20	# ifndef GETTEXT_DLL
	21	# define GETTEXT_DLL "libintl.dll"
	22	# endif
	23	! /* Dummy funcitons */
	24	static char null_libintl_gettext(const char );
	25	static char null_libintl_textdomain(const char );
	26	static char null_libintl_bindtextdomain(const char , const char *);
	27	--- 308,314 ----
	28	# ifndef GETTEXT_DLL
	29	# define GETTEXT_DLL "libintl.dll"
	30	# endif
	31	! /* Dummy functions */
	32	static char null_libintl_gettext(const char );
	33	static char null_libintl_textdomain(const char );
	34	static char null_libintl_bindtextdomain(const char , const char *);
	35	***************
	36	* 1409,1415 **
	37
	38
	39	/*
	40	! * mch_inchar(): low-level input funcion.
	41	* Get one or more characters from the keyboard or the mouse.
	42	* If time == 0, do not wait for characters.
	43	* If time == n, wait a short time for characters.
	44	--- 1409,1415 ----
	45
	46
	47	/*
	48	! * mch_inchar(): low-level input function.
	49	* Get one or more characters from the keyboard or the mouse.
	50	* If time == 0, do not wait for characters.
	51	* If time == n, wait a short time for characters.
	52	***************
	53	* 3451,3464 **
	54	* to avoid to perform a blocking read */
	55	ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */
	56	NULL, /* optional buffer */
	57	! 0, /* buffe size */
	58	NULL, /* number of read bytes */
	59	&availableBytes, /* available bytes total */
	60	NULL); /* byteLeft */
	61
	62	repeatCount = 0;
	63	/* We got real data in the pipe, read it */
	64	! while (ret != 0 && availableBytes > 0 && availableBytes > 0)
65	{
66	repeatCount++;
67	toRead =
68	--- 3451,3464 ----
69	* to avoid to perform a blocking read */
70	ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */
71	NULL, /* optional buffer */
72	! 0, /* buffer size */
73	NULL, /* number of read bytes */
74	&availableBytes, /* available bytes total */
75	NULL); /* byteLeft */
76
77	repeatCount = 0;
78	/* We got real data in the pipe, read it */
79	! while (ret != 0 && availableBytes > 0)
80	{
81	repeatCount++;
82	toRead =
83	***************
84	* 3638,3644 **
85	NULL, /* Process security attributes */
86	NULL, /* Thread security attributes */
87
88	! // this command can be litigeous, handle inheritence was
89	// deactivated for pending temp file, but, if we deactivate
90	// it, the pipes don't work for some reason.
91	TRUE, /* Inherit handles, first deactivated,
92	--- 3638,3644 ----
93	NULL, /* Process security attributes */
94	NULL, /* Thread security attributes */
95
96	! // this command can be litigious, handle inheritance was
97	// deactivated for pending temp file, but, if we deactivate
98	// it, the pipes don't work for some reason.
99	TRUE, /* Inherit handles, first deactivated,
100	*** ../vim-7.3.570/src/version.c 2012-06-29 12:57:03.000000000 +0200
101	--- src/version.c 2012-06-29 13:12:31.000000000 +0200
102	***************
103	* 716,717 **
104	--- 716,719 ----
105	{ /* Add new patch number below this line */
106	+ /**/
107	+ 571,
108	/**/
109
110	--
111	hundred-and-one symptoms of being an internet addict:
112	71. You wonder how people walk
113
114	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
115	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
116	\\\ an exciting new programming language -- http://www.Zimbu.org ///
117	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///