forked from aniani/vim
		
	updated for version 7.2-035
This commit is contained in:
		| @@ -2450,7 +2450,7 @@ find_closest_color(colormap, colorPtr) | |||||||
| 	*colorPtr = colortable[closest]; | 	*colorPtr = colortable[closest]; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     free(colortable); |     vim_free(colortable); | ||||||
|     return OK; |     return OK; | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5384,7 +5384,7 @@ preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data) | |||||||
| 			draw_feedback = (char *)alloc(draw_data->chg_first | 			draw_feedback = (char *)alloc(draw_data->chg_first | ||||||
| 							      + text->length); | 							      + text->length); | ||||||
| 		    else | 		    else | ||||||
| 			draw_feedback = realloc(draw_feedback, | 			draw_feedback = vim_realloc(draw_feedback, | ||||||
| 					 draw_data->chg_first + text->length); | 					 draw_data->chg_first + text->length); | ||||||
| 		    if (draw_feedback != NULL) | 		    if (draw_feedback != NULL) | ||||||
| 		    { | 		    { | ||||||
|   | |||||||
| @@ -873,7 +873,7 @@ lalloc(size, message) | |||||||
| 	    /* 3. check for available memory: call mch_avail_mem() */ | 	    /* 3. check for available memory: call mch_avail_mem() */ | ||||||
| 	    if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing) | 	    if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing) | ||||||
| 	    { | 	    { | ||||||
| 		vim_free((char *)p);	/* System is low... no go! */ | 		free((char *)p);	/* System is low... no go! */ | ||||||
| 		p = NULL; | 		p = NULL; | ||||||
| 	    } | 	    } | ||||||
| 	    else | 	    else | ||||||
|   | |||||||
| @@ -2905,7 +2905,7 @@ mch_early_init() | |||||||
|      * Ignore any errors. |      * Ignore any errors. | ||||||
|      */ |      */ | ||||||
| #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK) | #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK) | ||||||
|     signal_stack = malloc(SIGSTKSZ); |     signal_stack = (char *)alloc(SIGSTKSZ); | ||||||
|     init_signal_stack(); |     init_signal_stack(); | ||||||
| #endif | #endif | ||||||
| } | } | ||||||
| @@ -6814,7 +6814,8 @@ xsmp_close() | |||||||
|     if (xsmp_icefd != -1) |     if (xsmp_icefd != -1) | ||||||
|     { |     { | ||||||
| 	SmcCloseConnection(xsmp.smcconn, 0, NULL); | 	SmcCloseConnection(xsmp.smcconn, 0, NULL); | ||||||
| 	vim_free(xsmp.clientid); | 	if (xsmp.clientid != NULL) | ||||||
|  | 	    free(xsmp.clientid); | ||||||
| 	xsmp.clientid = NULL; | 	xsmp.clientid = NULL; | ||||||
| 	xsmp_icefd = -1; | 	xsmp_icefd = -1; | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -676,6 +676,8 @@ static char *(features[]) = | |||||||
|  |  | ||||||
| static int included_patches[] = | static int included_patches[] = | ||||||
| {   /* Add new patch number below this line */ | {   /* Add new patch number below this line */ | ||||||
|  | /**/ | ||||||
|  |     35, | ||||||
| /**/ | /**/ | ||||||
|     34, |     34, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user