Mercurial > vim
comparison src/ex_cmds2.c @ 294:1c1cbdc42f75 v7.0077
updated for version 7.0077
author | vimboss |
---|---|
date | Tue, 31 May 2005 22:22:17 +0000 |
parents | 8fa8d7964cf1 |
children | 529f887b5cb7 |
comparison
equal
deleted
inserted
replaced
293:f811be6fa9b5 | 294:1c1cbdc42f75 |
---|---|
2465 rtp_copy = vim_strsave(p_rtp); | 2465 rtp_copy = vim_strsave(p_rtp); |
2466 buf = alloc(MAXPATHL); | 2466 buf = alloc(MAXPATHL); |
2467 if (buf != NULL && rtp_copy != NULL) | 2467 if (buf != NULL && rtp_copy != NULL) |
2468 { | 2468 { |
2469 if (p_verbose > 1) | 2469 if (p_verbose > 1) |
2470 { | |
2471 verbose_enter(); | |
2470 smsg((char_u *)_("Searching for \"%s\" in \"%s\""), | 2472 smsg((char_u *)_("Searching for \"%s\" in \"%s\""), |
2471 (char *)name, (char *)p_rtp); | 2473 (char *)name, (char *)p_rtp); |
2474 verbose_leave(); | |
2475 } | |
2472 | 2476 |
2473 /* Loop over all entries in 'runtimepath'. */ | 2477 /* Loop over all entries in 'runtimepath'. */ |
2474 rtp = rtp_copy; | 2478 rtp = rtp_copy; |
2475 while (*rtp != NUL && (all || !did_one)) | 2479 while (*rtp != NUL && (all || !did_one)) |
2476 { | 2480 { |
2488 /* Append the pattern from "name" to buf[]. */ | 2492 /* Append the pattern from "name" to buf[]. */ |
2489 copy_option_part(&np, tail, (int)(MAXPATHL - (tail - buf)), | 2493 copy_option_part(&np, tail, (int)(MAXPATHL - (tail - buf)), |
2490 "\t "); | 2494 "\t "); |
2491 | 2495 |
2492 if (p_verbose > 2) | 2496 if (p_verbose > 2) |
2497 { | |
2498 verbose_enter(); | |
2493 smsg((char_u *)_("Searching for \"%s\""), buf); | 2499 smsg((char_u *)_("Searching for \"%s\""), buf); |
2500 verbose_leave(); | |
2501 } | |
2494 | 2502 |
2495 /* Expand wildcards, invoke the callback for each match. */ | 2503 /* Expand wildcards, invoke the callback for each match. */ |
2496 if (gen_expand_wildcards(1, &buf, &num_files, &files, | 2504 if (gen_expand_wildcards(1, &buf, &num_files, &files, |
2497 EW_FILE) == OK) | 2505 EW_FILE) == OK) |
2498 { | 2506 { |
2510 } | 2518 } |
2511 } | 2519 } |
2512 vim_free(buf); | 2520 vim_free(buf); |
2513 vim_free(rtp_copy); | 2521 vim_free(rtp_copy); |
2514 if (p_verbose > 0 && !did_one) | 2522 if (p_verbose > 0 && !did_one) |
2523 { | |
2524 verbose_enter(); | |
2515 smsg((char_u *)_("not found in 'runtimepath': \"%s\""), name); | 2525 smsg((char_u *)_("not found in 'runtimepath': \"%s\""), name); |
2526 verbose_leave(); | |
2527 } | |
2516 | 2528 |
2517 #ifdef AMIGA | 2529 #ifdef AMIGA |
2518 proc->pr_WindowPtr = save_winptr; | 2530 proc->pr_WindowPtr = save_winptr; |
2519 #endif | 2531 #endif |
2520 | 2532 |
2757 | 2769 |
2758 if (cookie.fp == NULL) | 2770 if (cookie.fp == NULL) |
2759 { | 2771 { |
2760 if (p_verbose > 0) | 2772 if (p_verbose > 0) |
2761 { | 2773 { |
2774 verbose_enter(); | |
2762 if (sourcing_name == NULL) | 2775 if (sourcing_name == NULL) |
2763 smsg((char_u *)_("could not source \"%s\""), fname); | 2776 smsg((char_u *)_("could not source \"%s\""), fname); |
2764 else | 2777 else |
2765 smsg((char_u *)_("line %ld: could not source \"%s\""), | 2778 smsg((char_u *)_("line %ld: could not source \"%s\""), |
2766 sourcing_lnum, fname); | 2779 sourcing_lnum, fname); |
2780 verbose_leave(); | |
2767 } | 2781 } |
2768 goto theend; | 2782 goto theend; |
2769 } | 2783 } |
2770 | 2784 |
2771 /* | 2785 /* |
2773 * - In verbose mode, give a message. | 2787 * - In verbose mode, give a message. |
2774 * - For a vimrc file, may want to set 'compatible', call vimrc_found(). | 2788 * - For a vimrc file, may want to set 'compatible', call vimrc_found(). |
2775 */ | 2789 */ |
2776 if (p_verbose > 1) | 2790 if (p_verbose > 1) |
2777 { | 2791 { |
2792 verbose_enter(); | |
2778 if (sourcing_name == NULL) | 2793 if (sourcing_name == NULL) |
2779 smsg((char_u *)_("sourcing \"%s\""), fname); | 2794 smsg((char_u *)_("sourcing \"%s\""), fname); |
2780 else | 2795 else |
2781 smsg((char_u *)_("line %ld: sourcing \"%s\""), | 2796 smsg((char_u *)_("line %ld: sourcing \"%s\""), |
2782 sourcing_lnum, fname); | 2797 sourcing_lnum, fname); |
2798 verbose_leave(); | |
2783 } | 2799 } |
2784 if (is_vimrc) | 2800 if (is_vimrc) |
2785 vimrc_found(); | 2801 vimrc_found(); |
2786 | 2802 |
2787 #ifdef USE_CRNL | 2803 #ifdef USE_CRNL |
2959 EMSG(_(e_interr)); | 2975 EMSG(_(e_interr)); |
2960 sourcing_name = save_sourcing_name; | 2976 sourcing_name = save_sourcing_name; |
2961 sourcing_lnum = save_sourcing_lnum; | 2977 sourcing_lnum = save_sourcing_lnum; |
2962 if (p_verbose > 1) | 2978 if (p_verbose > 1) |
2963 { | 2979 { |
2980 verbose_enter(); | |
2964 smsg((char_u *)_("finished sourcing %s"), fname); | 2981 smsg((char_u *)_("finished sourcing %s"), fname); |
2965 if (sourcing_name != NULL) | 2982 if (sourcing_name != NULL) |
2966 smsg((char_u *)_("continuing in %s"), sourcing_name); | 2983 smsg((char_u *)_("continuing in %s"), sourcing_name); |
2984 verbose_leave(); | |
2967 } | 2985 } |
2968 #ifdef STARTUPTIME | 2986 #ifdef STARTUPTIME |
2969 vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname); | 2987 vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname); |
2970 time_msg(IObuff, &tv_start); | 2988 time_msg(IObuff, &tv_start); |
2971 time_pop(&tv_rel); | 2989 time_pop(&tv_rel); |