Mercurial > vim
comparison src/menu.c @ 838:8e5830943bff v7.0e04
updated for version 7.0e04
author | vimboss |
---|---|
date | Thu, 20 Apr 2006 22:17:20 +0000 |
parents | 8bebcabccc2c |
children | 2c885fab04e3 |
comparison
equal
deleted
inserted
replaced
837:6bb1fa855dc9 | 838:8e5830943bff |
---|---|
2334 { | 2334 { |
2335 if (ga_grow(&menutrans_ga, 1) == OK) | 2335 if (ga_grow(&menutrans_ga, 1) == OK) |
2336 { | 2336 { |
2337 tp = (menutrans_T *)menutrans_ga.ga_data; | 2337 tp = (menutrans_T *)menutrans_ga.ga_data; |
2338 from = vim_strsave(from); | 2338 from = vim_strsave(from); |
2339 from_noamp = menu_text(from, NULL, NULL); | 2339 if (from != NULL) |
2340 to = vim_strnsave(to, (int)(arg - to)); | |
2341 if (from != NULL && from_noamp != NULL && to != NULL) | |
2342 { | 2340 { |
2343 tp[menutrans_ga.ga_len].from = from; | 2341 from_noamp = menu_text(from, NULL, NULL); |
2344 tp[menutrans_ga.ga_len].from_noamp = from_noamp; | 2342 to = vim_strnsave(to, (int)(arg - to)); |
2345 tp[menutrans_ga.ga_len].to = to; | 2343 if (from_noamp != NULL && to != NULL) |
2346 ++menutrans_ga.ga_len; | 2344 { |
2347 } | 2345 tp[menutrans_ga.ga_len].from = from; |
2348 else | 2346 tp[menutrans_ga.ga_len].from_noamp = from_noamp; |
2349 { | 2347 tp[menutrans_ga.ga_len].to = to; |
2350 vim_free(from); | 2348 ++menutrans_ga.ga_len; |
2351 vim_free(from_noamp); | 2349 } |
2352 vim_free(to); | 2350 else |
2351 { | |
2352 vim_free(from); | |
2353 vim_free(from_noamp); | |
2354 vim_free(to); | |
2355 } | |
2353 } | 2356 } |
2354 } | 2357 } |
2355 } | 2358 } |
2356 } | 2359 } |
2357 #endif | 2360 #endif |