Mercurial > vim
changeset 89:e1a8191c6768
updated for version 7.0036
| author | vimboss |
|---|---|
| date | Sun, 09 Jan 2005 21:16:21 +0000 |
| parents | 2b4debdc8d2c |
| children | 9d4f762cc1d9 |
| files | src/GvimExt/Make_ming.mak src/Make_ming.mak src/ex_docmd.c src/gui_w48.c src/proto/buffer.pro src/proto/gui_photon.pro |
| diffstat | 6 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -18,6 +18,7 @@ CROSS = no MINGWOLD = no ifeq ($(CROSS),yes) +DEL = rm ifeq ($(MINGWOLD),yes) CXX = i586-mingw32msvc-g++ CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks @@ -31,6 +32,11 @@ else CXX := g++ WINDRES := windres CXXFLAGS := -O2 -mno-cygwin +ifneq (sh.exe, $(SHELL)) +DEL = rm +else +DEL = del +endif endif LIBS := -luuid RES := gvimext.res @@ -59,5 +65,5 @@ gvimext.o: gvimext.cpp $(WINDRES) --input-format=rc --output-format=coff -DMING $? -o $@ clean: clean-custom - $(RM) $(OBJ) $(RES) $(DLL) + -$(DEL) $(OBJ) $(RES) $(DLL)
--- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -581,7 +581,7 @@ ifneq (sh.exe, $(SHELL)) @echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' >> pathdef.c @echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' >> pathdef.c @echo 'char_u *all_cflags = (char_u *)"$(CC) $(CFLAGS)";' >> pathdef.c - @echo 'char_u *all_lflags = (char_u *)"$(CC) -s -o $(TARGET) $(LIB) -luuid -lole32 $(PYTHONLIB) $(RUBYLIB)";' >> pathdef.c + @echo 'char_u *all_lflags = (char_u *)"$(CC) $(CFLAGS) $(LFLAGS) -o $(TARGET) $(LIB) -lole32 -luuid $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(RUBYLIB)";' >> pathdef.c @echo 'char_u *compiled_user = (char_u *)"$(USERNAME)";' >> pathdef.c @echo 'char_u *compiled_sys = (char_u *)"$(USERDOMAIN)";' >> pathdef.c else @@ -591,7 +591,7 @@ else @echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)"; >> pathdef.c @echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)"; >> pathdef.c @echo char_u *all_cflags = (char_u *)"$(CC) $(CFLAGS)"; >> pathdef.c - @echo char_u *all_lflags = (char_u *)"$(CC) -s -o $(TARGET) $(LIB) -luuid -lole32 $(PYTHONLIB) $(RUBYLIB)"; >> pathdef.c + @echo char_u *all_lflags = (char_u *)"$(CC) $(CFLAGS) $(LFLAGS) -o $(TARGET) $(LIB) -lole32 -luuid $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(RUBYLIB)"; >> pathdef.c @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> pathdef.c @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> pathdef.c endif
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -8085,6 +8085,11 @@ ex_normal(eap) ex_startinsert(eap) exarg_T *eap; { + /* Ignore the command when already in Insert mode. Inserting an + * expression register that invokes a function can do this. */ + if (State & INSERT) + return; + if (eap->forceit) { coladvance((colnr_T)MAXCOL);
--- a/src/gui_w48.c +++ b/src/gui_w48.c @@ -2414,7 +2414,7 @@ gui_mch_destroy_scrollbar(scrollbar_T *s * Get current mouse coordinates in text window. */ void -gui_mch_get_mouse_(int *x, int *y) +gui_mch_getmouse(int *x, int *y) { RECT rct; POINT mp;
--- a/src/proto/buffer.pro +++ b/src/proto/buffer.pro @@ -25,7 +25,7 @@ pos_T *buflist_findfpos __ARGS((buf_T *b linenr_T buflist_findlnum __ARGS((buf_T *buf)); void buflist_list __ARGS((exarg_T *eap)); int buflist_name_nr __ARGS((int fnum, char_u **fname, linenr_T *lnum)); -int setfname __ARGS((buf_T *buf, char_u *ffname, char_u *sfname, int exist_msg)); +int setfname __ARGS((buf_T *buf, char_u *ffname, char_u *sfname, int message)); void buf_set_name __ARGS((int fnum, char_u *name)); void buf_name_changed __ARGS((buf_T *buf)); buf_T *setaltfname __ARGS((char_u *ffname, char_u *sfname, linenr_T lnum));
--- a/src/proto/gui_photon.pro +++ b/src/proto/gui_photon.pro @@ -23,7 +23,7 @@ void gui_mch_enable_scrollbar __ARGS((sc void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb)); void mch_set_mouse_shape __ARGS((int shape)); void gui_mch_mousehide __ARGS((int hide)); -void gui_mch_getmouse __ARGS((int *x, int *y)); +int gui_mch_getmouse __ARGS((int *x, int *y)); void gui_mch_setmouse __ARGS((int x, int y)); long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); void gui_mch_new_colors __ARGS((void));