aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0111

Browse Source
This commit is contained in:
Bram Moolenaar
2005-07-20 21:54:57 +00:00
parent 9fad308621
commit 6a9aa37a3e
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Make_mvc.mak
View File

@@ -355,12 +355,13 @@ LIBC =
! else ! else
LIBC = /fixed:no LIBC = /fixed:no
! endif ! endif
! ifdef USE_MSVCRT
! ifndef USE_MSVCRT
LIBC = $(LIBC) libcd.lib
! else
CFLAGS = $(CFLAGS) -MDd CFLAGS = $(CFLAGS) -MDd
LIBC = $(LIBC) msvcrtd.lib LIBC = $(LIBC) msvcrtd.lib
! elseif defined(MULTITHREADED)
LIBC = $(LIBC) libcmtd.lib
! else
LIBC = $(LIBC) libcd.lib
! endif ! endif
!endif # DEBUG !endif # DEBUG
@@ -837,7 +838,7 @@ $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL)
$(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c $(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c
$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c $(INCL) $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c $(INCL)
$(CC) $(CFLAGS) $(PERL_INC) if_mzsch.c $(CC) $(CFLAGS) if_mzsch.c \
-DMZSCHEME_COLLECTS=\"$(MZSCHEME:\=\\)\\collects\" -DMZSCHEME_COLLECTS=\"$(MZSCHEME:\=\\)\\collects\"
$(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c $(INCL) $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c $(INCL)

21
src/if_sniff.c
View File

@@ -817,15 +817,16 @@ HandleSniffRequest(buffer)
vi_open_file(file); vi_open_file(file);
else if (buf!=curbuf) else if (buf!=curbuf)
{ {
vim_snprintf(VICommand, sizeof(VICommand), SelectBuf, file); vim_snprintf(VICommand, sizeof(VICommand),
(char *)SelectBuf, file);
vi_exec_cmd(VICommand); vi_exec_cmd(VICommand);
} }
if (command == 'o') if (command == 'o')
vi_set_cursor_pos((long)position); vi_set_cursor_pos((long)position);
else else
{ {
vim_snprintf(VICommand, sizeof(VICommand), GotoLine, vim_snprintf(VICommand, sizeof(VICommand),
(int)position); (char *)GotoLine, (int)position);
vi_exec_cmd(VICommand); vi_exec_cmd(VICommand);
} }
checkpcmark(); /* [mark.c] */ checkpcmark(); /* [mark.c] */
@@ -854,7 +855,8 @@ HandleSniffRequest(buffer)
buf = vi_find_buffer(file); buf = vi_find_buffer(file);
if (buf && !buf->b_changed) /* delete buffer only if not modified */ if (buf && !buf->b_changed) /* delete buffer only if not modified */
{ {
vim_snprintf(VICommand, sizeof(VICommand), DeleteBuf, file); vim_snprintf(VICommand, sizeof(VICommand),
(char *)DeleteBuf, file);
vi_exec_cmd(VICommand); vi_exec_cmd(VICommand);
} }
vi_open_file(new_path); vi_open_file(new_path);
@@ -876,8 +878,8 @@ HandleSniffRequest(buffer)
buf->b_flags |= BF_CHECK_RO + BF_NEVERLOADED; buf->b_flags |= BF_CHECK_RO + BF_NEVERLOADED;
if (writable && !buf->b_changed) if (writable && !buf->b_changed)
{ {
vim_snprintf(VICommand, sizeof(VICommand), UnloadBuf, vim_snprintf(VICommand, sizeof(VICommand),
file); (char *)UnloadBuf, file);
vi_exec_cmd(VICommand); vi_exec_cmd(VICommand);
} }
} }
@@ -897,7 +899,8 @@ HandleSniffRequest(buffer)
if (tab_width > 0 && tab_width <= 16) if (tab_width > 0 && tab_width <= 16)
{ {
vim_snprintf(VICommand, sizeof(VICommand), SetTab, tab_width); vim_snprintf(VICommand, sizeof(VICommand),
(char *)SetTab, tab_width);
vi_exec_cmd(VICommand); vi_exec_cmd(VICommand);
} }
break; break;
@@ -912,12 +915,12 @@ HandleSniffRequest(buffer)
} }
case 'A' : /* Warning/Info msg */ case 'A' : /* Warning/Info msg */
vi_msg(arguments); vi_msg(arguments);
if (!strncmp(arguments, "Disconnected", 12)) /* "Disconnected ..." */ if (!strncmp(arguments, "Disconnected", 12))
sniff_disconnect(1); /* unexpected disconnection */ sniff_disconnect(1); /* unexpected disconnection */
break; break;
case 'a' : /* Error msg */ case 'a' : /* Error msg */
vi_error_msg(arguments); vi_error_msg(arguments);
if (!strncmp(arguments, "Cannot connect", 14)) /* "Cannot connect ..." */ if (!strncmp(arguments, "Cannot connect", 14))
sniff_disconnect(1); sniff_disconnect(1);
break; break;