Mercurial > vim

comparison src/eval.c @ 4936:ae05437a744a v7.3.1213

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1213 Problem: Can't build with small features and Python. Solution: Adjust #ifdefs.
author Bram Moolenaar <bram@vim.org>
date Sun, 16 Jun 2013 17:32:40 +0200
parents 0792cc5133ce
children a594ce86b5ea
comparison
equal deleted inserted replaced
4935:8991454c0024 4936:ae05437a744a
110 static char *e_funcref = N_("E718: Funcref required"); 110 static char *e_funcref = N_("E718: Funcref required");
111 static char *e_dictrange = N_("E719: Cannot use [:] with a Dictionary"); 111 static char *e_dictrange = N_("E719: Cannot use [:] with a Dictionary");
112 static char *e_letwrong = N_("E734: Wrong variable type for %s="); 112 static char *e_letwrong = N_("E734: Wrong variable type for %s=");
113 static char *e_nofunc = N_("E130: Unknown function: %s"); 113 static char *e_nofunc = N_("E130: Unknown function: %s");
114 static char *e_illvar = N_("E461: Illegal variable name: %s"); 114 static char *e_illvar = N_("E461: Illegal variable name: %s");
115 #ifdef FEAT_FLOAT
115 static char *e_float_as_string = N_("E806: using Float as a String"); 116 static char *e_float_as_string = N_("E806: using Float as a String");
117 #endif
116 118
117 static dictitem_T globvars_var; /* variable used for g: */ 119 static dictitem_T globvars_var; /* variable used for g: */
118 #define globvarht globvardict.dv_hashtab 120 #define globvarht globvardict.dv_hashtab
119 121
120 /* 122 /*
11880 * Find window specified by "vp" in tabpage "tp". 11882 * Find window specified by "vp" in tabpage "tp".
11881 */ 11883 */
11882 static win_T * 11884 static win_T *
11883 find_win_by_nr(vp, tp) 11885 find_win_by_nr(vp, tp)
11884 typval_T *vp; 11886 typval_T *vp;
11885 tabpage_T *tp; /* NULL for current tab page */ 11887 tabpage_T *tp UNUSED; /* NULL for current tab page */
11886 { 11888 {
11887 #ifdef FEAT_WINDOWS 11889 #ifdef FEAT_WINDOWS
11888 win_T *wp; 11890 win_T *wp;
11889 #endif 11891 #endif
11890 int nr; 11892 int nr;
11930 int off; /* 1 for gettabwinvar() */ 11932 int off; /* 1 for gettabwinvar() */
11931 { 11933 {
11932 win_T *win, *oldcurwin; 11934 win_T *win, *oldcurwin;
11933 char_u *varname; 11935 char_u *varname;
11934 dictitem_T *v; 11936 dictitem_T *v;
11935 tabpage_T *tp, *oldtabpage; 11937 tabpage_T *tp = NULL;
11938 tabpage_T *oldtabpage;
11936 int done = FALSE; 11939 int done = FALSE;
11937 11940
11938 #ifdef FEAT_WINDOWS 11941 #ifdef FEAT_WINDOWS
11939 if (off == 1) 11942 if (off == 1)
11940 tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL)); 11943 tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
16681 static void 16684 static void
16682 f_settabvar(argvars, rettv) 16685 f_settabvar(argvars, rettv)
16683 typval_T *argvars; 16686 typval_T *argvars;
16684 typval_T *rettv; 16687 typval_T *rettv;
16685 { 16688 {
16689 #ifdef FEAT_WINDOWS
16686 tabpage_T *save_curtab; 16690 tabpage_T *save_curtab;
16691 tabpage_T *tp;
16692 #endif
16687 char_u *varname, *tabvarname; 16693 char_u *varname, *tabvarname;
16688 typval_T *varp; 16694 typval_T *varp;
16689 tabpage_T *tp;
16690 16695
16691 rettv->vval.v_number = 0; 16696 rettv->vval.v_number = 0;
16692 16697
16693 if (check_restricted() || check_secure()) 16698 if (check_restricted() || check_secure())
16694 return; 16699 return;
16695 16700
16701 #ifdef FEAT_WINDOWS
16696 tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL)); 16702 tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
16703 #endif
16697 varname = get_tv_string_chk(&argvars[1]); 16704 varname = get_tv_string_chk(&argvars[1]);
16698 varp = &argvars[2]; 16705 varp = &argvars[2];
16699 16706
16700 if (tp != NULL && varname != NULL && varp != NULL) 16707 if (varname != NULL && varp != NULL
16701 { 16708 #ifdef FEAT_WINDOWS
16709 && tp != NULL
16710 #endif
16711 )
16712 {
16713 #ifdef FEAT_WINDOWS
16702 save_curtab = curtab; 16714 save_curtab = curtab;
16703 goto_tabpage_tp(tp, FALSE, FALSE); 16715 goto_tabpage_tp(tp, FALSE, FALSE);
16716 #endif
16704 16717
16705 tabvarname = alloc((unsigned)STRLEN(varname) + 3); 16718 tabvarname = alloc((unsigned)STRLEN(varname) + 3);
16706 if (tabvarname != NULL) 16719 if (tabvarname != NULL)
16707 { 16720 {
16708 STRCPY(tabvarname, "t:"); 16721 STRCPY(tabvarname, "t:");
16709 STRCPY(tabvarname + 2, varname); 16722 STRCPY(tabvarname + 2, varname);
16710 set_var(tabvarname, varp, TRUE); 16723 set_var(tabvarname, varp, TRUE);
16711 vim_free(tabvarname); 16724 vim_free(tabvarname);
16712 } 16725 }
16713 16726
16727 #ifdef FEAT_WINDOWS
16714 /* Restore current tabpage */ 16728 /* Restore current tabpage */
16715 if (valid_tabpage(save_curtab)) 16729 if (valid_tabpage(save_curtab))
16716 goto_tabpage_tp(save_curtab, FALSE, FALSE); 16730 goto_tabpage_tp(save_curtab, FALSE, FALSE);
16731 #endif
16717 } 16732 }
16718 } 16733 }
16719 16734
16720 /* 16735 /*
16721 * "settabwinvar()" function 16736 * "settabwinvar()" function
16755 tabpage_T *save_curtab; 16770 tabpage_T *save_curtab;
16756 #endif 16771 #endif
16757 char_u *varname, *winvarname; 16772 char_u *varname, *winvarname;
16758 typval_T *varp; 16773 typval_T *varp;
16759 char_u nbuf[NUMBUFLEN]; 16774 char_u nbuf[NUMBUFLEN];
16760 tabpage_T *tp; 16775 tabpage_T *tp = NULL;
16761 16776
16762 if (check_restricted() || check_secure()) 16777 if (check_restricted() || check_secure())
16763 return; 16778 return;
16764 16779
16765 #ifdef FEAT_WINDOWS 16780 #ifdef FEAT_WINDOWS