Mercurial > vim
comparison src/gui.c @ 694:07d199fe02ed v7.0209
updated for version 7.0209
author | vimboss |
---|---|
date | Mon, 27 Feb 2006 23:58:35 +0000 |
parents | 8106f3da02d0 |
children | ef3b59af4207 |
comparison
equal
deleted
inserted
replaced
693:05dc93b9c61f | 694:07d199fe02ed |
---|---|
344 * Switch on the mouse by default, unless the user changed it already. | 344 * Switch on the mouse by default, unless the user changed it already. |
345 * This can then be changed in the .gvimrc. | 345 * This can then be changed in the .gvimrc. |
346 */ | 346 */ |
347 if (!option_was_set((char_u *)"mouse")) | 347 if (!option_was_set((char_u *)"mouse")) |
348 set_string_option_direct((char_u *)"mouse", -1, | 348 set_string_option_direct((char_u *)"mouse", -1, |
349 (char_u *)"a", OPT_FREE); | 349 (char_u *)"a", OPT_FREE, SID_NONE); |
350 | 350 |
351 /* | 351 /* |
352 * If -U option given, use only the initializations from that file and | 352 * If -U option given, use only the initializations from that file and |
353 * nothing else. Skip all initializations for "-U NONE" or "-u NORC". | 353 * nothing else. Skip all initializations for "-U NONE" or "-u NORC". |
354 */ | 354 */ |
786 if (font != NOFONT) | 786 if (font != NOFONT) |
787 { | 787 { |
788 gui_mch_free_font(gui.wide_font); | 788 gui_mch_free_font(gui.wide_font); |
789 gui.wide_font = font; | 789 gui.wide_font = font; |
790 set_string_option_direct((char_u *)"gfw", -1, | 790 set_string_option_direct((char_u *)"gfw", -1, |
791 wide_name, OPT_FREE); | 791 wide_name, OPT_FREE, 0); |
792 # ifdef FEAT_EVAL | |
793 set_option_scriptID((char_u *)"gfw", current_SID); | |
794 # endif | |
795 } | 792 } |
796 } | 793 } |
797 break; | 794 break; |
798 } | 795 } |
799 } | 796 } |
3385 res, MAXPATHL, p_gtl, use_sandbox, | 3382 res, MAXPATHL, p_gtl, use_sandbox, |
3386 0, (int)Columns, NULL, NULL); | 3383 0, (int)Columns, NULL, NULL); |
3387 STRCPY(NameBuff, res); | 3384 STRCPY(NameBuff, res); |
3388 | 3385 |
3389 if (called_emsg) | 3386 if (called_emsg) |
3390 { | |
3391 set_string_option_direct((char_u *)"guitablabel", -1, | 3387 set_string_option_direct((char_u *)"guitablabel", -1, |
3392 (char_u *)"", OPT_FREE); | 3388 (char_u *)"", OPT_FREE, SID_ERROR); |
3393 # ifdef FEAT_EVAL | |
3394 set_option_scriptID((char_u *)"guitablabel", SID_ERROR); | |
3395 # endif | |
3396 } | |
3397 called_emsg |= save_called_emsg; | 3389 called_emsg |= save_called_emsg; |
3398 } | 3390 } |
3399 else | 3391 else |
3400 { | 3392 { |
3401 /* Get the buffer name into NameBuff[] */ | 3393 /* Get the buffer name into NameBuff[] */ |
4807 ga_concat(&ga, (char_u *)"\\>"); | 4799 ga_concat(&ga, (char_u *)"\\>"); |
4808 | 4800 |
4809 if (type == FRD_REPLACEALL) | 4801 if (type == FRD_REPLACEALL) |
4810 { | 4802 { |
4811 ga_concat(&ga, (char_u *)"/"); | 4803 ga_concat(&ga, (char_u *)"/"); |
4812 concat_esc(&ga, repl_text, '/'); /* escape slashes */ | 4804 /* escape / and \ */ |
4805 p = vim_strsave_escaped(repl_text, (char_u *)"/\\"); | |
4806 if (p != NULL) | |
4807 ga_concat(&ga, p); | |
4808 vim_free(p); | |
4813 ga_concat(&ga, (char_u *)"/g"); | 4809 ga_concat(&ga, (char_u *)"/g"); |
4814 } | 4810 } |
4815 ga_append(&ga, NUL); | 4811 ga_append(&ga, NUL); |
4816 | 4812 |
4817 if (type == FRD_REPLACE) | 4813 if (type == FRD_REPLACE) |