[packages/vim.git] / 6.2.296

To: vim-dev@vim.org
Subject: Patch 6.2.296 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.2.296 (extra)
Problem:    Same as 6.2.295.
Solution:   Extra files for patch 6.2.295.
Files:	    src/os_amiga.c, src/os_msdos.c, src/os_riscos.c, src/os_win32.c,
	    src/proto/os_amiga.pro, src/proto/os_msdos.pro,
	    src/proto/os_riscos.pro, src/proto/os_win32.pro


*** ../vim-6.2.295/src/os_amiga.c	Sun Oct 12 17:25:14 2003
--- src/os_amiga.c	Sat Feb 28 16:35:03 2004
***************
*** 111,120 ****
   * Return number of characters read.
   */
      int
! mch_inchar(buf, maxlen, time)
      char_u  *buf;
      int	    maxlen;
      long    time;		/* milli seconds */
  {
      int	    len;
      long    utime;
--- 111,121 ----
   * Return number of characters read.
   */
      int
! mch_inchar(buf, maxlen, time, tb_change_cnt)
      char_u  *buf;
      int	    maxlen;
      long    time;		/* milli seconds */
+     int	    tb_change_cnt;
  {
      int	    len;
      long    utime;
*** ../vim-6.2.295/src/os_msdos.c	Thu May 15 20:49:07 2003
--- src/os_msdos.c	Sat Feb 28 16:35:15 2004
***************
*** 982,988 ****
  mch_inchar(
      char_u	*buf,
      int		maxlen,
!     long	time)
  {
      int		len = 0;
      int		c;
--- 982,989 ----
  mch_inchar(
      char_u	*buf,
      int		maxlen,
!     long	time,
!     int		tb_change_cnt)
  {
      int		len = 0;
      int		c;
*** ../vim-6.2.295/src/os_riscos.c	Sat Apr 19 15:12:24 2003
--- src/os_riscos.c	Sat Feb 28 16:35:28 2004
***************
*** 217,226 ****
   * TODO: call convert_input() for 'fileencoding' to 'encoding' conversion.
   */
      int
! mch_inchar(buf, maxlen, wtime)
      char_u  *buf;
      int	    maxlen;
      long    wtime;
  {
      int got=0;
      unsigned int start_time = clock();
--- 217,227 ----
   * TODO: call convert_input() for 'fileencoding' to 'encoding' conversion.
   */
      int
! mch_inchar(buf, maxlen, wtime, tb_change_cnt)
      char_u  *buf;
      int	    maxlen;
      long    wtime;
+     int	    tb_change_cnt;
  {
      int got=0;
      unsigned int start_time = clock();
*** ../vim-6.2.295/src/os_win32.c	Tue Feb  3 16:55:34 2004
--- src/os_win32.c	Sat Feb 28 16:36:00 2004
***************
*** 1268,1274 ****
  mch_inchar(
      char_u	*buf,
      int		maxlen,
!     long	time)
  {
  #ifndef FEAT_GUI_W32	    /* this isn't used for the GUI */
  
--- 1268,1275 ----
  mch_inchar(
      char_u	*buf,
      int		maxlen,
!     long	time,
!     int		tb_change_cnt)
  {
  #ifndef FEAT_GUI_W32	    /* this isn't used for the GUI */
  
***************
*** 1356,1361 ****
--- 1357,1369 ----
  
      while ((len == 0 || WaitForChar(0L)) && len < maxlen)
      {
+ 	if (typebuf_changed(tb_change_cnt))
+ 	{
+ 	    /* "buf" may be invalid now if a client put something in the
+ 	     * typeahead buffer and "buf" is in the typeahead buffer. */
+ 	    len = 0;
+ 	    break;
+ 	}
  #ifdef FEAT_MOUSE
  	if (g_nMouseClick != -1 && maxlen - len >= 5)
  	{
***************
*** 1378,1390 ****
  	{
  	    c = tgetch();
  
! #ifdef FEAT_CLIENTSERVER
! 	    if (input_available())
  	    {
! 		len = read_from_input_buf(buf, (long)maxlen);
  		break;
  	    }
- #endif
  
  	    if (c == Ctrl_C && ctrl_c_interrupts)
  	    {
--- 1386,1398 ----
  	{
  	    c = tgetch();
  
! 	    if (typebuf_changed(tb_change_cnt))
  	    {
! 		/* "buf" may be invalid now if a client put something in the
! 		 * typeahead buffer and "buf" is in the typeahead buffer. */
! 		len = 0;
  		break;
  	    }
  
  	    if (c == Ctrl_C && ctrl_c_interrupts)
  	    {
*** ../vim-6.2.295/src/proto/os_amiga.pro	Sun Jun  1 12:26:29 2003
--- src/proto/os_amiga.pro	Sat Feb 28 16:40:57 2004
***************
*** 2,8 ****
  void win_resize_on __ARGS((void));
  void win_resize_off __ARGS((void));
  void mch_write __ARGS((char_u *p, int len));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long time));
  int mch_char_avail __ARGS((void));
  long_u mch_avail_mem __ARGS((int special));
  void mch_delay __ARGS((long msec, int ignoreinput));
--- 2,8 ----
  void win_resize_on __ARGS((void));
  void win_resize_off __ARGS((void));
  void mch_write __ARGS((char_u *p, int len));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
  int mch_char_avail __ARGS((void));
  long_u mch_avail_mem __ARGS((int special));
  void mch_delay __ARGS((long msec, int ignoreinput));
*** ../vim-6.2.295/src/proto/os_msdos.pro	Sun Jun  1 12:26:30 2003
--- src/proto/os_msdos.pro	Sat Feb 28 16:41:08 2004
***************
*** 4,10 ****
  long_u mch_avail_mem __ARGS((int special));
  void mch_delay __ARGS((long msec, int ignoreinput));
  void mch_write __ARGS((char_u *s, int len));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long time));
  int mch_char_avail __ARGS((void));
  void mch_suspend __ARGS((void));
  void mch_init __ARGS((void));
--- 4,10 ----
  long_u mch_avail_mem __ARGS((int special));
  void mch_delay __ARGS((long msec, int ignoreinput));
  void mch_write __ARGS((char_u *s, int len));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
  int mch_char_avail __ARGS((void));
  void mch_suspend __ARGS((void));
  void mch_init __ARGS((void));
*** ../vim-6.2.295/src/proto/os_riscos.pro	Sun Jun  1 12:26:32 2003
--- src/proto/os_riscos.pro	Sat Feb 28 16:41:14 2004
***************
*** 1,6 ****
  /* os_riscos.c */
  void mch_write __ARGS((char_u *s, int len));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime));
  int mch_char_avail __ARGS((void));
  long_u mch_avail_mem __ARGS((int special));
  void mch_delay __ARGS((long msec, int ignoreinput));
--- 1,6 ----
  /* os_riscos.c */
  void mch_write __ARGS((char_u *s, int len));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
  int mch_char_avail __ARGS((void));
  long_u mch_avail_mem __ARGS((int special));
  void mch_delay __ARGS((long msec, int ignoreinput));
*** ../vim-6.2.295/src/proto/os_win32.pro	Tue Feb  3 16:55:34 2004
--- src/proto/os_win32.pro	Sat Feb 28 16:41:22 2004
***************
*** 6,12 ****
  void mch_setmouse __ARGS((int on));
  void mch_update_cursor __ARGS((void));
  int mch_char_avail __ARGS((void));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long time));
  void mch_init __ARGS((void));
  void mch_exit __ARGS((int r));
  int mch_check_win __ARGS((int argc, char **argv));
--- 6,12 ----
  void mch_setmouse __ARGS((int on));
  void mch_update_cursor __ARGS((void));
  int mch_char_avail __ARGS((void));
! int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
  void mch_init __ARGS((void));
  void mch_exit __ARGS((int r));
  int mch_check_win __ARGS((int argc, char **argv));
*** ../vim-6.2.295/src/version.c	Sun Feb 29 14:45:49 2004
--- src/version.c	Sun Feb 29 14:47:03 2004
***************
*** 639,640 ****
--- 639,642 ----
  {   /* Add new patch number below this line */
+ /**/
+     296,
  /**/

-- 
Not too long ago, a keyboard was something to make music with...

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///
Commit	Line	Data
34eabb99 AG	1	To: vim-dev@vim.org
	2	Subject: Patch 6.2.296 (extra)
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 6.2.296 (extra)
	11	Problem: Same as 6.2.295.
	12	Solution: Extra files for patch 6.2.295.
	13	Files: src/os_amiga.c, src/os_msdos.c, src/os_riscos.c, src/os_win32.c,
	14	src/proto/os_amiga.pro, src/proto/os_msdos.pro,
	15	src/proto/os_riscos.pro, src/proto/os_win32.pro
	16
	17
	18	*** ../vim-6.2.295/src/os_amiga.c Sun Oct 12 17:25:14 2003
	19	--- src/os_amiga.c Sat Feb 28 16:35:03 2004
	20	***************
	21	* 111,120 **
	22	* Return number of characters read.
	23	*/
	24	int
	25	! mch_inchar(buf, maxlen, time)
	26	char_u *buf;
	27	int maxlen;
	28	long time; /* milli seconds */
	29	{
	30	int len;
	31	long utime;
	32	--- 111,121 ----
	33	* Return number of characters read.
	34	*/
	35	int
	36	! mch_inchar(buf, maxlen, time, tb_change_cnt)
	37	char_u *buf;
	38	int maxlen;
	39	long time; /* milli seconds */
	40	+ int tb_change_cnt;
	41	{
	42	int len;
	43	long utime;
	44	*** ../vim-6.2.295/src/os_msdos.c Thu May 15 20:49:07 2003
	45	--- src/os_msdos.c Sat Feb 28 16:35:15 2004
	46	***************
	47	* 982,988 **
	48	mch_inchar(
	49	char_u *buf,
	50	int maxlen,
	51	! long time)
	52	{
	53	int len = 0;
	54	int c;
	55	--- 982,989 ----
	56	mch_inchar(
	57	char_u *buf,
	58	int maxlen,
	59	! long time,
	60	! int tb_change_cnt)
	61	{
	62	int len = 0;
	63	int c;
	64	*** ../vim-6.2.295/src/os_riscos.c Sat Apr 19 15:12:24 2003
65	--- src/os_riscos.c Sat Feb 28 16:35:28 2004
66	***************
67	* 217,226 **
68	* TODO: call convert_input() for 'fileencoding' to 'encoding' conversion.
69	*/
70	int
71	! mch_inchar(buf, maxlen, wtime)
72	char_u *buf;
73	int maxlen;
74	long wtime;
75	{
76	int got=0;
77	unsigned int start_time = clock();
78	--- 217,227 ----
79	* TODO: call convert_input() for 'fileencoding' to 'encoding' conversion.
80	*/
81	int
82	! mch_inchar(buf, maxlen, wtime, tb_change_cnt)
83	char_u *buf;
84	int maxlen;
85	long wtime;
86	+ int tb_change_cnt;
87	{
88	int got=0;
89	unsigned int start_time = clock();
90	*** ../vim-6.2.295/src/os_win32.c Tue Feb 3 16:55:34 2004
91	--- src/os_win32.c Sat Feb 28 16:36:00 2004
92	***************
93	* 1268,1274 **
94	mch_inchar(
95	char_u *buf,
96	int maxlen,
97	! long time)
98	{
99	#ifndef FEAT_GUI_W32 /* this isn't used for the GUI */
100
101	--- 1268,1275 ----
102	mch_inchar(
103	char_u *buf,
104	int maxlen,
105	! long time,
106	! int tb_change_cnt)
107	{
108	#ifndef FEAT_GUI_W32 /* this isn't used for the GUI */
109
110	***************
111	* 1356,1361 **
112	--- 1357,1369 ----
113
114	while ((len == 0 \|\| WaitForChar(0L)) && len < maxlen)
115	{
116	+ if (typebuf_changed(tb_change_cnt))
117	+ {
118	+ /* "buf" may be invalid now if a client put something in the
119	+ * typeahead buffer and "buf" is in the typeahead buffer. */
120	+ len = 0;
121	+ break;
122	+ }
123	#ifdef FEAT_MOUSE
124	if (g_nMouseClick != -1 && maxlen - len >= 5)
125	{
126	***************
127	* 1378,1390 **
128	{
129	c = tgetch();
130
131	! #ifdef FEAT_CLIENTSERVER
132	! if (input_available())
133	{
134	! len = read_from_input_buf(buf, (long)maxlen);
135	break;
136	}
137	- #endif
138
139	if (c == Ctrl_C && ctrl_c_interrupts)
140	{
141	--- 1386,1398 ----
142	{
143	c = tgetch();
144
145	! if (typebuf_changed(tb_change_cnt))
146	{
147	! /* "buf" may be invalid now if a client put something in the
148	! * typeahead buffer and "buf" is in the typeahead buffer. */
149	! len = 0;
150	break;
151	}
152
153	if (c == Ctrl_C && ctrl_c_interrupts)
154	{
155	*** ../vim-6.2.295/src/proto/os_amiga.pro Sun Jun 1 12:26:29 2003
156	--- src/proto/os_amiga.pro Sat Feb 28 16:40:57 2004
157	***************
158	* 2,8 **
159	void win_resize_on __ARGS((void));
160	void win_resize_off __ARGS((void));
161	void mch_write __ARGS((char_u *p, int len));
162	! int mch_inchar __ARGS((char_u *buf, int maxlen, long time));
163	int mch_char_avail __ARGS((void));
164	long_u mch_avail_mem __ARGS((int special));
165	void mch_delay __ARGS((long msec, int ignoreinput));
166	--- 2,8 ----
167	void win_resize_on __ARGS((void));
168	void win_resize_off __ARGS((void));
169	void mch_write __ARGS((char_u *p, int len));
170	! int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
171	int mch_char_avail __ARGS((void));
172	long_u mch_avail_mem __ARGS((int special));
173	void mch_delay __ARGS((long msec, int ignoreinput));
174	*** ../vim-6.2.295/src/proto/os_msdos.pro Sun Jun 1 12:26:30 2003
175	--- src/proto/os_msdos.pro Sat Feb 28 16:41:08 2004
176	***************
177	* 4,10 **
178	long_u mch_avail_mem __ARGS((int special));
179	void mch_delay __ARGS((long msec, int ignoreinput));
180	void mch_write __ARGS((char_u *s, int len));
181	! int mch_inchar __ARGS((char_u *buf, int maxlen, long time));
182	int mch_char_avail __ARGS((void));
183	void mch_suspend __ARGS((void));
184	void mch_init __ARGS((void));
185	--- 4,10 ----
186	long_u mch_avail_mem __ARGS((int special));
187	void mch_delay __ARGS((long msec, int ignoreinput));
188	void mch_write __ARGS((char_u *s, int len));
189	! int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
190	int mch_char_avail __ARGS((void));
191	void mch_suspend __ARGS((void));
192	void mch_init __ARGS((void));
193	*** ../vim-6.2.295/src/proto/os_riscos.pro Sun Jun 1 12:26:32 2003
194	--- src/proto/os_riscos.pro Sat Feb 28 16:41:14 2004
195	***************
196	* 1,6 **
197	/* os_riscos.c */
198	void mch_write __ARGS((char_u *s, int len));
199	! int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime));
200	int mch_char_avail __ARGS((void));
201	long_u mch_avail_mem __ARGS((int special));
202	void mch_delay __ARGS((long msec, int ignoreinput));
203	--- 1,6 ----
204	/* os_riscos.c */
205	void mch_write __ARGS((char_u *s, int len));
206	! int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
207	int mch_char_avail __ARGS((void));
208	long_u mch_avail_mem __ARGS((int special));
209	void mch_delay __ARGS((long msec, int ignoreinput));
210	*** ../vim-6.2.295/src/proto/os_win32.pro Tue Feb 3 16:55:34 2004
211	--- src/proto/os_win32.pro Sat Feb 28 16:41:22 2004
212	***************
213	* 6,12 **
214	void mch_setmouse __ARGS((int on));
215	void mch_update_cursor __ARGS((void));
216	int mch_char_avail __ARGS((void));
217	! int mch_inchar __ARGS((char_u *buf, int maxlen, long time));
218	void mch_init __ARGS((void));
219	void mch_exit __ARGS((int r));
220	int mch_check_win __ARGS((int argc, char **argv));
221	--- 6,12 ----
222	void mch_setmouse __ARGS((int on));
223	void mch_update_cursor __ARGS((void));
224	int mch_char_avail __ARGS((void));
225	! int mch_inchar __ARGS((char_u *buf, int maxlen, long time, int tb_change_cnt));
226	void mch_init __ARGS((void));
227	void mch_exit __ARGS((int r));
228	int mch_check_win __ARGS((int argc, char **argv));
229	*** ../vim-6.2.295/src/version.c Sun Feb 29 14:45:49 2004
230	--- src/version.c Sun Feb 29 14:47:03 2004
231	***************
232	* 639,640 **
233	--- 639,642 ----
234	{ /* Add new patch number below this line */
235	+ /**/
236	+ 296,
237	/**/
238
239	--
240	Not too long ago, a keyboard was something to make music with...
241
242	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
243	/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
244	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
245	\\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///