Mercurial > vim

comparison src/eval.c @ 294:1c1cbdc42f75 v7.0077

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0077
author vimboss
date Tue, 31 May 2005 22:22:17 +0000
parents 9a10e4d195b3
children 2bfc2b703314
comparison
equal deleted inserted replaced
293:f811be6fa9b5 294:1c1cbdc42f75
10069 + ga_userinput.ga_len); 10069 + ga_userinput.ga_len);
10070 rettv->vval.v_number = 0; /* OK */ 10070 rettv->vval.v_number = 0; /* OK */
10071 } 10071 }
10072 else if (p_verbose > 1) 10072 else if (p_verbose > 1)
10073 { 10073 {
10074 msg((char_u *)_("called inputrestore() more often than inputsave()")); 10074 verb_msg((char_u *)_("called inputrestore() more often than inputsave()"));
10075 rettv->vval.v_number = 1; /* Failed */ 10075 rettv->vval.v_number = 1; /* Failed */
10076 } 10076 }
10077 } 10077 }
10078 10078
10079 /* 10079 /*
12784 match = vim_regexec_nl(&regmatch, str, col); 12784 match = vim_regexec_nl(&regmatch, str, col);
12785 if (match) 12785 if (match)
12786 end = regmatch.startp[0]; 12786 end = regmatch.startp[0];
12787 else 12787 else
12788 end = str + STRLEN(str); 12788 end = str + STRLEN(str);
12789 if (keepempty || end > str || (l->lv_len > 0 && *str != NUL)) 12789 if (keepempty || end > str || (l->lv_len > 0 && *str != NUL
12790 && match && end < regmatch.endp[0]))
12790 { 12791 {
12791 ni = listitem_alloc(); 12792 ni = listitem_alloc();
12792 if (ni == NULL) 12793 if (ni == NULL)
12793 break; 12794 break;
12794 ni->li_tv.v_type = VAR_STRING; 12795 ni->li_tv.v_type = VAR_STRING;
16928 cat_func_name(sourcing_name + STRLEN(sourcing_name), fp); 16929 cat_func_name(sourcing_name + STRLEN(sourcing_name), fp);
16929 16930
16930 if (p_verbose >= 12) 16931 if (p_verbose >= 12)
16931 { 16932 {
16932 ++no_wait_return; 16933 ++no_wait_return;
16933 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 16934 verbose_enter_scroll();
16935
16934 smsg((char_u *)_("calling %s"), sourcing_name); 16936 smsg((char_u *)_("calling %s"), sourcing_name);
16935 if (p_verbose >= 14) 16937 if (p_verbose >= 14)
16936 { 16938 {
16937 char_u buf[MSG_BUF_LEN]; 16939 char_u buf[MSG_BUF_LEN];
16938 char_u numbuf[NUMBUFLEN]; 16940 char_u numbuf[NUMBUFLEN];
16954 } 16956 }
16955 } 16957 }
16956 msg_puts((char_u *)")"); 16958 msg_puts((char_u *)")");
16957 } 16959 }
16958 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 16960 msg_puts((char_u *)"\n"); /* don't overwrite this either */
16959 cmdline_row = msg_row; 16961
16962 verbose_leave_scroll();
16960 --no_wait_return; 16963 --no_wait_return;
16961 } 16964 }
16962 } 16965 }
16963 #ifdef FEAT_PROFILE 16966 #ifdef FEAT_PROFILE
16964 if (do_profiling) 16967 if (do_profiling)
17013 17016
17014 /* when being verbose, mention the return value */ 17017 /* when being verbose, mention the return value */
17015 if (p_verbose >= 12) 17018 if (p_verbose >= 12)
17016 { 17019 {
17017 ++no_wait_return; 17020 ++no_wait_return;
17018 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 17021 verbose_enter_scroll();
17019 17022
17020 if (aborting()) 17023 if (aborting())
17021 smsg((char_u *)_("%s aborted"), sourcing_name); 17024 smsg((char_u *)_("%s aborted"), sourcing_name);
17022 else if (fc.rettv->v_type == VAR_NUMBER) 17025 else if (fc.rettv->v_type == VAR_NUMBER)
17023 smsg((char_u *)_("%s returning #%ld"), sourcing_name, 17026 smsg((char_u *)_("%s returning #%ld"), sourcing_name,
17035 buf, MSG_BUF_CLEN); 17038 buf, MSG_BUF_CLEN);
17036 smsg((char_u *)_("%s returning %s"), sourcing_name, buf); 17039 smsg((char_u *)_("%s returning %s"), sourcing_name, buf);
17037 vim_free(tofree); 17040 vim_free(tofree);
17038 } 17041 }
17039 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 17042 msg_puts((char_u *)"\n"); /* don't overwrite this either */
17040 cmdline_row = msg_row; 17043
17044 verbose_leave_scroll();
17041 --no_wait_return; 17045 --no_wait_return;
17042 } 17046 }
17043 17047
17044 vim_free(sourcing_name); 17048 vim_free(sourcing_name);
17045 sourcing_name = save_sourcing_name; 17049 sourcing_name = save_sourcing_name;
17051 #endif 17055 #endif
17052 17056
17053 if (p_verbose >= 12 && sourcing_name != NULL) 17057 if (p_verbose >= 12 && sourcing_name != NULL)
17054 { 17058 {
17055 ++no_wait_return; 17059 ++no_wait_return;
17056 msg_scroll = TRUE; /* always scroll up, don't overwrite */ 17060 verbose_enter_scroll();
17061
17057 smsg((char_u *)_("continuing in %s"), sourcing_name); 17062 smsg((char_u *)_("continuing in %s"), sourcing_name);
17058 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 17063 msg_puts((char_u *)"\n"); /* don't overwrite this either */
17059 cmdline_row = msg_row; 17064
17065 verbose_leave_scroll();
17060 --no_wait_return; 17066 --no_wait_return;
17061 } 17067 }
17062 17068
17063 did_emsg |= save_did_emsg; 17069 did_emsg |= save_did_emsg;
17064 current_funccal = save_fcp; 17070 current_funccal = save_fcp;