[packages/vim.git] / 7.0.051

To: vim-dev@vim.org
Subject: Patch 7.0.051
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 7.0.051 (after 7.0.44)
Problem:    The Perl interface doesn't compile or doesn't work properly.
Solution:   Remove the spaces before #ifdef and avoid an empty line above it.
Files:	    src/if_perl.xs


*** ../vim-7.0.050/src/if_perl.xs	Tue Aug  8 16:47:38 2006
--- src/if_perl.xs	Fri Aug 11 22:51:01 2006
***************
*** 1068,1098 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
!     #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
!     #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
!     #endif
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! 
!     #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
!     #endif
  	    }
  	}
      }
--- 1068,1097 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
! #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
! #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
! #endif
  		if (u_savesub(lnum) == OK)
  		{
  		    ml_replace(lnum, (char_u *)line, TRUE);
  		    changed_bytes(lnum, 0);
  		}
! #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
! #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
! #endif
  	    }
  	}
      }
***************
*** 1130,1144 ****
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
  		    buf_T	*save_curbuf = curbuf;
!     #ifdef FEAT_AUTOCMD
  		    aco_save_T	aco;
  
  		    /* set curwin/curbuf for "vimbuf" and save some things */
  		    aucmd_prepbuf(&aco, vimbuf);
!     #else
  		    curbuf = vimbuf;
  		    curwin->w_buffer = vimbuf;
!     #endif
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
--- 1129,1143 ----
  		if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
  		{
  		    buf_T	*save_curbuf = curbuf;
! #ifdef FEAT_AUTOCMD
  		    aco_save_T	aco;
  
  		    /* set curwin/curbuf for "vimbuf" and save some things */
  		    aucmd_prepbuf(&aco, vimbuf);
! #else
  		    curbuf = vimbuf;
  		    curwin->w_buffer = vimbuf;
! #endif
  		    if (u_savedel(lnum, 1) == OK)
  		    {
  			ml_delete(lnum, 0);
***************
*** 1146,1159 ****
  			if (save_curbuf == curbuf)
  			    check_cursor();
  		    }
!     #ifdef FEAT_AUTOCMD
  		    /* restore curwin/curbuf and a few other things */
  		    aucmd_restbuf(&aco);
  		    /* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
  		    curwin->w_buffer = save_curbuf;
  		    curbuf = save_curbuf;
!     #endif
  		    update_curbuf(VALID);
  		}
  	    }
--- 1145,1158 ----
  			if (save_curbuf == curbuf)
  			    check_cursor();
  		    }
! #ifdef FEAT_AUTOCMD
  		    /* restore curwin/curbuf and a few other things */
  		    aucmd_restbuf(&aco);
  		    /* Careful: autocommands may have made "vimbuf" invalid! */
! #else
  		    curwin->w_buffer = save_curbuf;
  		    curbuf = save_curbuf;
! #endif
  		    update_curbuf(VALID);
  		}
  	    }
***************
*** 1180,1210 ****
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
!     #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
!     #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
!     #endif
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! 
!     #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
!     #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
!     #endif
  		update_curbuf(VALID);
  	    }
  	}
--- 1179,1208 ----
  	    line = SvPV(ST(i),PL_na);
  	    if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
  	    {
! #ifdef FEAT_AUTOCMD
  		aco_save_T	aco;
  
  		/* set curwin/curbuf for "vimbuf" and save some things */
  		aucmd_prepbuf(&aco, vimbuf);
! #else
  		buf_T	*save_curbuf = curbuf;
  
  		curbuf = vimbuf;
  		curwin->w_buffer = vimbuf;
! #endif
  		if (u_inssub(lnum + 1) == OK)
  		{
  		    ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
  		    appended_lines_mark(lnum, 1L);
  		}
! #ifdef FEAT_AUTOCMD
  		/* restore curwin/curbuf and a few other things */
  		aucmd_restbuf(&aco);
  		/* Careful: autocommands may have made "vimbuf" invalid! */
! #else
  		curwin->w_buffer = save_curbuf;
  		curbuf = save_curbuf;
! #endif
  		update_curbuf(VALID);
  	    }
  	}
*** ../vim-7.0.050/src/version.c	Tue Aug  8 21:36:15 2006
--- src/version.c	Fri Aug 11 22:55:25 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     51,
  /**/

-- 
"A clear conscience is usually the sign of a bad memory."
                             -- Steven Wright

 /// Bram Moolenaar -- Bram@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    ///
Commit	Line	Data
a328bbc4 AG	1	To: vim-dev@vim.org
	2	Subject: Patch 7.0.051
	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 7.0.051 (after 7.0.44)
	11	Problem: The Perl interface doesn't compile or doesn't work properly.
	12	Solution: Remove the spaces before #ifdef and avoid an empty line above it.
	13	Files: src/if_perl.xs
	14
	15
	16	*** ../vim-7.0.050/src/if_perl.xs Tue Aug 8 16:47:38 2006
	17	--- src/if_perl.xs Fri Aug 11 22:51:01 2006
	18	***************
	19	* 1068,1098 **
	20	line = SvPV(ST(i),PL_na);
	21	if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
	22	{
	23	! #ifdef FEAT_AUTOCMD
	24	aco_save_T aco;
	25
	26	/* set curwin/curbuf for "vimbuf" and save some things */
	27	aucmd_prepbuf(&aco, vimbuf);
	28	! #else
	29	buf_T *save_curbuf = curbuf;
	30
	31	curbuf = vimbuf;
	32	curwin->w_buffer = vimbuf;
	33	! #endif
	34	if (u_savesub(lnum) == OK)
	35	{
	36	ml_replace(lnum, (char_u *)line, TRUE);
	37	changed_bytes(lnum, 0);
	38	}
	39	!
	40	! #ifdef FEAT_AUTOCMD
	41	/* restore curwin/curbuf and a few other things */
	42	aucmd_restbuf(&aco);
	43	/* Careful: autocommands may have made "vimbuf" invalid! */
	44	! #else
	45	curwin->w_buffer = save_curbuf;
	46	curbuf = save_curbuf;
	47	! #endif
	48	}
	49	}
	50	}
	51	--- 1068,1097 ----
	52	line = SvPV(ST(i),PL_na);
	53	if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
	54	{
	55	! #ifdef FEAT_AUTOCMD
	56	aco_save_T aco;
	57
	58	/* set curwin/curbuf for "vimbuf" and save some things */
	59	aucmd_prepbuf(&aco, vimbuf);
	60	! #else
	61	buf_T *save_curbuf = curbuf;
	62
	63	curbuf = vimbuf;
	64	curwin->w_buffer = vimbuf;
65	! #endif
66	if (u_savesub(lnum) == OK)
67	{
68	ml_replace(lnum, (char_u *)line, TRUE);
69	changed_bytes(lnum, 0);
70	}
71	! #ifdef FEAT_AUTOCMD
72	/* restore curwin/curbuf and a few other things */
73	aucmd_restbuf(&aco);
74	/* Careful: autocommands may have made "vimbuf" invalid! */
75	! #else
76	curwin->w_buffer = save_curbuf;
77	curbuf = save_curbuf;
78	! #endif
79	}
80	}
81	}
82	***************
83	* 1130,1144 **
84	if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
85	{
86	buf_T *save_curbuf = curbuf;
87	! #ifdef FEAT_AUTOCMD
88	aco_save_T aco;
89
90	/* set curwin/curbuf for "vimbuf" and save some things */
91	aucmd_prepbuf(&aco, vimbuf);
92	! #else
93	curbuf = vimbuf;
94	curwin->w_buffer = vimbuf;
95	! #endif
96	if (u_savedel(lnum, 1) == OK)
97	{
98	ml_delete(lnum, 0);
99	--- 1129,1143 ----
100	if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
101	{
102	buf_T *save_curbuf = curbuf;
103	! #ifdef FEAT_AUTOCMD
104	aco_save_T aco;
105
106	/* set curwin/curbuf for "vimbuf" and save some things */
107	aucmd_prepbuf(&aco, vimbuf);
108	! #else
109	curbuf = vimbuf;
110	curwin->w_buffer = vimbuf;
111	! #endif
112	if (u_savedel(lnum, 1) == OK)
113	{
114	ml_delete(lnum, 0);
115	***************
116	* 1146,1159 **
117	if (save_curbuf == curbuf)
118	check_cursor();
119	}
120	! #ifdef FEAT_AUTOCMD
121	/* restore curwin/curbuf and a few other things */
122	aucmd_restbuf(&aco);
123	/* Careful: autocommands may have made "vimbuf" invalid! */
124	! #else
125	curwin->w_buffer = save_curbuf;
126	curbuf = save_curbuf;
127	! #endif
128	update_curbuf(VALID);
129	}
130	}
131	--- 1145,1158 ----
132	if (save_curbuf == curbuf)
133	check_cursor();
134	}
135	! #ifdef FEAT_AUTOCMD
136	/* restore curwin/curbuf and a few other things */
137	aucmd_restbuf(&aco);
138	/* Careful: autocommands may have made "vimbuf" invalid! */
139	! #else
140	curwin->w_buffer = save_curbuf;
141	curbuf = save_curbuf;
142	! #endif
143	update_curbuf(VALID);
144	}
145	}
146	***************
147	* 1180,1210 **
148	line = SvPV(ST(i),PL_na);
149	if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
150	{
151	! #ifdef FEAT_AUTOCMD
152	aco_save_T aco;
153
154	/* set curwin/curbuf for "vimbuf" and save some things */
155	aucmd_prepbuf(&aco, vimbuf);
156	! #else
157	buf_T *save_curbuf = curbuf;
158
159	curbuf = vimbuf;
160	curwin->w_buffer = vimbuf;
161	! #endif
162	if (u_inssub(lnum + 1) == OK)
163	{
164	ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
165	appended_lines_mark(lnum, 1L);
166	}
167	!
168	! #ifdef FEAT_AUTOCMD
169	/* restore curwin/curbuf and a few other things */
170	aucmd_restbuf(&aco);
171	/* Careful: autocommands may have made "vimbuf" invalid! */
172	! #else
173	curwin->w_buffer = save_curbuf;
174	curbuf = save_curbuf;
175	! #endif
176	update_curbuf(VALID);
177	}
178	}
179	--- 1179,1208 ----
180	line = SvPV(ST(i),PL_na);
181	if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
182	{
183	! #ifdef FEAT_AUTOCMD
184	aco_save_T aco;
185
186	/* set curwin/curbuf for "vimbuf" and save some things */
187	aucmd_prepbuf(&aco, vimbuf);
188	! #else
189	buf_T *save_curbuf = curbuf;
190
191	curbuf = vimbuf;
192	curwin->w_buffer = vimbuf;
193	! #endif
194	if (u_inssub(lnum + 1) == OK)
195	{
196	ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
197	appended_lines_mark(lnum, 1L);
198	}
199	! #ifdef FEAT_AUTOCMD
200	/* restore curwin/curbuf and a few other things */
201	aucmd_restbuf(&aco);
202	/* Careful: autocommands may have made "vimbuf" invalid! */
203	! #else
204	curwin->w_buffer = save_curbuf;
205	curbuf = save_curbuf;
206	! #endif
207	update_curbuf(VALID);
208	}
209	}
210	*** ../vim-7.0.050/src/version.c Tue Aug 8 21:36:15 2006
211	--- src/version.c Fri Aug 11 22:55:25 2006
212	***************
213	* 668,669 **
214	--- 668,671 ----
215	{ /* Add new patch number below this line */
216	+ /**/
217	+ 51,
218	/**/
219
220	--
221	"A clear conscience is usually the sign of a bad memory."
222	-- Steven Wright
223
224	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
225	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
226	\\\ download, build and distribute -- http://www.A-A-P.org ///
227	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///