aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.795

Browse Source 
Problem:    MzScheme does not build with tiny features.
Solution:   Add #ifdefs.  Also add UNUSED to avoid warnings.  And change
            library ordering.
This commit is contained in:
Bram Moolenaar 2013-01-30 17:41:50 +01:00
parent a50e5866b0
commit d214221375
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -1345,6 +1345,8 @@ LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS) DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS)
# Note: MZSCHEME_LIBS must come before LIBS, because LIBS adds -lm which is
# needed by racket.
ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR) ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR)
ALL_LIBS = \ ALL_LIBS = \
$(GUI_LIBS1) \ $(GUI_LIBS1) \
@ -1353,10 +1355,10 @@ ALL_LIBS = \
$(X_PRE_LIBS) \ $(X_PRE_LIBS) \
$(X_LIBS) \ $(X_LIBS) \
$(X_EXTRA_LIBS) \ $(X_EXTRA_LIBS) \
$(MZSCHEME_LIBS) \
$(LIBS) \ $(LIBS) \
$(EXTRA_LIBS) \ $(EXTRA_LIBS) \
$(LUA_LIBS) \ $(LUA_LIBS) \
$(MZSCHEME_LIBS) \
$(PERL_LIBS) \ $(PERL_LIBS) \
$(PYTHON_LIBS) \ $(PYTHON_LIBS) \
$(PYTHON3_LIBS) \ $(PYTHON3_LIBS) \

24
src/if_mzsch.c
View File

@ -1483,7 +1483,7 @@ vim_command(void *data, int argc, Scheme_Object **argv)
/* (eval {expr-string}) */ /* (eval {expr-string}) */
static Scheme_Object * static Scheme_Object *
vim_eval(void *data, int argc, Scheme_Object **argv) vim_eval(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{ {
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
Vim_Prim *prim = (Vim_Prim *)data; Vim_Prim *prim = (Vim_Prim *)data;
@ -1686,10 +1686,12 @@ get_curr_win(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
static Scheme_Object * static Scheme_Object *
get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED) get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{ {
win_T *w;
int n = 0; int n = 0;
#ifdef FEAT_WINDOWS
win_T *w;
for (w = firstwin; w != NULL; w = w->w_next) for (w = firstwin; w != NULL; w = w->w_next)
#endif
++n; ++n;
return scheme_make_integer(n); return scheme_make_integer(n);
} }
@ -1701,12 +1703,14 @@ get_window_list(void *data, int argc, Scheme_Object **argv)
Vim_Prim *prim = (Vim_Prim *)data; Vim_Prim *prim = (Vim_Prim *)data;
vim_mz_buffer *buf; vim_mz_buffer *buf;
Scheme_Object *list; Scheme_Object *list;
win_T *w; win_T *w = firstwin;
buf = get_buffer_arg(prim->name, 0, argc, argv); buf = get_buffer_arg(prim->name, 0, argc, argv);
list = scheme_null; list = scheme_null;
for (w = firstwin; w != NULL; w = w->w_next) #ifdef FEAT_WINDOWS
for ( ; w != NULL; w = w->w_next)
#endif
if (w->w_buffer == buf->buf) if (w->w_buffer == buf->buf)
{ {
list = scheme_make_pair(window_new(w), list); list = scheme_make_pair(window_new(w), list);
@ -1755,14 +1759,16 @@ window_new(win_T *win)
/* (get-win-num [window]) */ /* (get-win-num [window]) */
static Scheme_Object * static Scheme_Object *
get_window_num(void *data, int argc, Scheme_Object **argv) get_window_num(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{ {
int nr = 1;
#ifdef FEAT_WINDOWS
Vim_Prim *prim = (Vim_Prim *)data; Vim_Prim *prim = (Vim_Prim *)data;
win_T *win = get_window_arg(prim->name, 0, argc, argv)->win; win_T *win = get_window_arg(prim->name, 0, argc, argv)->win;
int nr = 1;
win_T *wp; win_T *wp;
for (wp = firstwin; wp != win; wp = wp->w_next) for (wp = firstwin; wp != win; wp = wp->w_next)
#endif
++nr; ++nr;
return scheme_make_integer(nr); return scheme_make_integer(nr);
@ -1773,14 +1779,16 @@ get_window_num(void *data, int argc, Scheme_Object **argv)
get_window_by_num(void *data, int argc, Scheme_Object **argv) get_window_by_num(void *data, int argc, Scheme_Object **argv)
{ {
Vim_Prim *prim = (Vim_Prim *)data; Vim_Prim *prim = (Vim_Prim *)data;
win_T *win; win_T *win = firstwin;
int fnum; int fnum;
fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0)); fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0));
if (fnum < 1) if (fnum < 1)
scheme_signal_error(_("window index is out of range")); scheme_signal_error(_("window index is out of range"));
for (win = firstwin; win != NULL; win = win->w_next, --fnum) #ifdef FEAT_WINDOWS
for ( ; win != NULL; win = win->w_next, --fnum)
#endif
if (fnum == 1) /* to be 1-based */ if (fnum == 1) /* to be 1-based */
return window_new(win); return window_new(win);

2
src/version.c
View File

@ -725,6 +725,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
795,
/**/ /**/
794, 794,
/**/ /**/