diff options
-rw-r--r-- | runtime/doc/if_sniff.txt | 90 | ||||
-rw-r--r-- | src/Make_mvc.mak | 25 | ||||
-rw-r--r-- | src/Make_vms.mms | 26 | ||||
-rw-r--r-- | src/Makefile | 20 | ||||
-rwxr-xr-x | src/auto/configure | 24 | ||||
-rw-r--r-- | src/charset.c | 3 | ||||
-rw-r--r-- | src/config.h.in | 3 | ||||
-rw-r--r-- | src/config.mk.in | 3 | ||||
-rw-r--r-- | src/configure.in | 13 | ||||
-rw-r--r-- | src/edit.c | 6 | ||||
-rw-r--r-- | src/eval.c | 3 | ||||
-rw-r--r-- | src/ex_cmds.h | 3 | ||||
-rw-r--r-- | src/ex_cmds2.c | 7 | ||||
-rw-r--r-- | src/ex_docmd.c | 9 | ||||
-rw-r--r-- | src/ex_getln.c | 3 | ||||
-rw-r--r-- | src/feature.h | 1 | ||||
-rw-r--r-- | src/gui_gtk_x11.c | 36 | ||||
-rw-r--r-- | src/gui_w32.c | 19 | ||||
-rw-r--r-- | src/gui_x11.c | 36 | ||||
-rw-r--r-- | src/if_sniff.c | 1201 | ||||
-rw-r--r-- | src/if_sniff.h | 16 | ||||
-rw-r--r-- | src/keymap.h | 4 | ||||
-rw-r--r-- | src/normal.c | 18 | ||||
-rw-r--r-- | src/os_unix.c | 41 | ||||
-rw-r--r-- | src/os_win32.c | 21 | ||||
-rw-r--r-- | src/structs.h | 4 | ||||
-rw-r--r-- | src/term.c | 10 | ||||
-rw-r--r-- | src/ui.c | 16 | ||||
-rw-r--r-- | src/version.c | 7 | ||||
-rw-r--r-- | src/vim.h | 4 |
30 files changed, 26 insertions, 1646 deletions
diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt index a3d52085f2..6feaa53da5 100644 --- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -1,95 +1,11 @@ -*if_sniff.txt* For Vim version 7.4. Last change: 2005 Mar 29 +*if_sniff.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Anton Leherbauer (toni@takefive.co.at) -SNiFF+ and Vim *sniff* - -1. Introduction |sniff-intro| -2. Commands |sniff-commands| -3. Compiling Vim with SNiFF+ interface |sniff-compiling| - -{Vi does not have any of these commands} *E275* *E274* *E276* *E278* *E279* - -The SNiFF+ interface only works, when Vim was compiled with the |+sniff| -feature. - -============================================================================== -1. Introduction *sniff-intro* - -The following features for the use with SNiFF+ are available: - - * Vim can be used for all editing requests - * SNiFF+ recognizes and updates all browsers when a file is saved in Vim - * SNiFF+ commands can be issued directly from Vim - -How to use Vim with SNiFF+ - 1. Make sure SNiFF+ is running. - 2. In the Editor view of the Preferences dialog set the Field named - 'External Editor' to 'Emacs/Vim'. - 4. Start Vim - 5. Connect to SNiFF+ (:sniff connect) - -Once a connection is established, SNiFF+ uses Vim for all requests to show or -edit source code. On the other hand, you can send queries to SNiFF+ with the -:sniff command. - -============================================================================== -2. Commands *sniff-commands* - - *:sniff* *:sni* -:sni[ff] request [symbol] Send request to sniff with optional symbol. - {not in Vi} -:sni[ff] Display all possible requests and the connection - status - -Most requests require a symbol (identifier) as parameter. If it is omitted, -Vim will use the current word under the cursor. -The available requests are listed below: - -request mapping description -------------------------------------------------------------------------------- -connect sc Establish connection with SNiFF+. - Make sure SNiFF+ is prepared for this in the - Preferences -disconnect sq Disconnect from SNiFF+. You can reconnect any - time with :sniff connect (or 'sc') -toggle st Toggle between implementation - and definition file -find-symbol sf Load the symbol into a Symbol Browser -browse-class sb Loads the class into a Class Browser -superclass ss Edit superclass of symbol -overridden so Edit overridden method of symbol -retrieve-file srf Retrieve symbol in current file -retrieve-project srp Retrieve symbol in current project -retrieve-all-projects srP Retrieve symbol in all projects -retrieve-next sR Retrieve symbol using current Retriever - settings -goto-symbol sg Goto definition or implementation of symbol -hierarchy sh Load symbol into the Hierarchy Browser -restr-hier sH same as above but show only related classes -xref-to sxt Start a refers-to query on symbol and - load the results into the Cross Referencer -xref-by sxb Start a referred-by query on symbol -xref-has sxh Start a refers-to components query on symbol -xref-used-by sxu Start a referred-by as component query on - symbol -show-docu sd Show documentation of symbol -gen-docu sD Generate documentation of symbol - -The mappings are defined in a file 'sniff.vim', which is part of every SNiFF+ -product ($SNIFF_DIR/config/sniff.vim). This file is sourced whenever Vim -connects to SNiFF+. - -============================================================================== -3. Compiling Vim with SNiFF+ interface *sniff-compiling* - -To compile Vim with SNiFF+ support, you need two source files of the extra -archive: if_sniff.c and if_sniff.h. -On Unix: Edit the Makefile and uncomment the line "--enable-sniff". Or run -configure manually with this argument. -On NT: Specify SNIFF=yes with your make command. +The SNiFF+ support was removed at patch 7.4.1433. If you want to check it out +sync to before that. vim:tw=78:ts=8:ft=help:norl: diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 0843d25c42..4378e00779 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -82,8 +82,6 @@ # TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3) # You must set TCL_VER_LONG when you set TCL_VER. # -# SNiFF+ interface: SNIFF=yes -# # Cscope support: CSCOPE=yes # # Iconv library support (always dynamically loaded): @@ -269,16 +267,6 @@ WP64CHECK = /Wp64 CTAGS = ctags !endif -!if "$(SNIFF)" == "yes" -# SNIFF - Include support for SNiFF+. -SNIFF_INCL = if_sniff.h -SNIFF_OBJ = $(OBJDIR)/if_sniff.obj -SNIFF_LIB = shell32.lib -SNIFF_DEFS = -DFEAT_SNIFF -# The SNiFF integration needs multithreaded libraries! -MULTITHREADED = yes -!endif - !ifndef CSCOPE CSCOPE = yes !endif @@ -380,7 +368,7 @@ WINVER = 0x0501 #VIMRUNTIMEDIR = somewhere CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ - $(SNIFF_DEFS) $(CSCOPE_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ + $(CSCOPE_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ $(NBDEBUG_DEFS) $(XPM_DEFS) \ $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \ /Fo$(OUTDIR)/ @@ -528,7 +516,7 @@ CFLAGS = $(CFLAGS) /Zl /MTd !endif # DEBUG INCL = vim.h os_win32.h ascii.h feature.h globals.h keymap.h macros.h \ - proto.h option.h structs.h term.h $(SNIFF_INCL) $(CSCOPE_INCL) \ + proto.h option.h structs.h term.h $(CSCOPE_INCL) \ $(NBDEBUG_INCL) OBJ = \ @@ -997,7 +985,7 @@ conflags = $(conflags) /map /mapinfo:lines !ENDIF LINKARGS1 = $(linkdebug) $(conflags) -LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \ +LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \ $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB) @@ -1020,12 +1008,12 @@ all: $(VIM).exe \ $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ - $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ + $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ version.c version.h $(CC) $(CFLAGS) version.c $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \ $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ - $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ + $(TCL_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 @@ -1212,9 +1200,6 @@ $(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h $(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL) $(CC) $(CFLAGS) $(RUBY_INC) if_ruby.c -$(OUTDIR)/if_sniff.obj: $(OUTDIR) if_sniff.c $(INCL) - $(CC) $(CFLAGS) if_sniff.c - $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL) $(CC) $(CFLAGS) $(TCL_INC) if_tcl.c diff --git a/src/Make_vms.mms b/src/Make_vms.mms index da535b90f5..35167cb78d 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -2,7 +2,7 @@ # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com> -# Last change: 2016 Jan 22 +# Last change: 2016 Feb 27 # # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64 # with MMS and MMK @@ -66,7 +66,6 @@ CCVER = YES # VIM_PERL = YES # VIM_PYTHON = YES # VIM_RUBY = YES -# VIM_SNIFF = YES # X Input Method. For entering special languages like chinese and # Japanese. Please define just one: VIM_XIM or VIM_HANGULIN @@ -228,15 +227,6 @@ TCL_LIB = ,OS_VMS_TCL.OPT/OPT TCL_INC = ,dka0:[tcl80.generic] .ENDIF -.IFDEF VIM_SNIFF -# SNIFF related setup. -SNIFF_DEF = ,"FEAT_SNIFF" -SNIFF_SRC = if_sniff.c -SNIFF_OBJ = if_sniff.obj -SNIFF_LIB = -SNIFF_INC = -.ENDIF - .IFDEF VIM_RUBY # RUBY related setup. RUBY_DEF = ,"FEAT_RUBY" @@ -293,7 +283,7 @@ VIMHOST = "''F$TRNLNM("SYS$NODE")'''F$TRNLNM("UCX$INET_HOST")'.''F$TRNLNM("UCX$I .SUFFIXES : .obj .c ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) - - $(TCL_DEF)$(SNIFF_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) - + $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) - $(CFLAGS)$(GUI_FLAG) - /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC)$(PERL_INC)$(PYTHON_INC)$(TCL_INC)) @@ -302,12 +292,12 @@ ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) - # as $(GUI_INC) - replaced with $(GUI_INC_VER) # Otherwise should not be any other difference. ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) - - $(TCL_DEF)$(SNIFF_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) - + $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) - $(CFLAGS)$(GUI_FLAG) - /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC_VER)$(PERL_INC)$(PYTHON_INC)$(TCL_INC)) ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \ - $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(SNIFF_LIB) $(RUBY_LIB) + $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB) SRC = blowfish.c buffer.c charset.c crypt.c, crypt_zip.c diff.c digraph.c edit.c eval.c ex_cmds.c ex_cmds2.c \ ex_docmd.c ex_eval.c ex_getln.c if_xcmdsrv.c fileio.c fold.c getchar.c \ @@ -315,7 +305,7 @@ SRC = blowfish.c buffer.c charset.c crypt.c, crypt_zip.c diff.c digraph.c edit.c misc2.c move.c normal.c ops.c option.c popupmnu.c quickfix.c regexp.c search.c sha256.c\ spell.c syntax.c tag.c term.c termlib.c ui.c undo.c version.c screen.c \ window.c os_unix.c os_vms.c pathdef.c \ - $(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) $(SNIFF_SRC) \ + $(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) \ $(RUBY_SRC) $(HANGULIN_SRC) $(MZSCH_SRC) OBJ = blowfish.obj buffer.obj charset.obj crypt.obj, crypt_zip.obj diff.obj digraph.obj edit.obj eval.obj \ @@ -326,7 +316,7 @@ OBJ = blowfish.obj buffer.obj charset.obj crypt.obj, crypt_zip.obj diff.obj digr regexp.obj search.obj sha256.obj spell.obj syntax.obj tag.obj term.obj termlib.obj \ ui.obj undo.obj screen.obj version.obj window.obj os_unix.obj \ os_vms.obj pathdef.obj if_mzsch.obj\ - $(GUI_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(TCL_OBJ) $(SNIFF_OBJ) \ + $(GUI_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(TCL_OBJ) \ $(RUBY_OBJ) $(HANGULIN_OBJ) $(MZSCH_OBJ) # Default target is making the executable @@ -778,10 +768,6 @@ if_ruby.obj : if_ruby.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h farsi.h arabic.h version.h -if_sniff.obj : if_sniff.c vim.h [.auto]config.h feature.h os_unix.h \ - ascii.h keymap.h term.h macros.h structs.h regexp.h \ - gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ - globals.h farsi.h arabic.h os_unixx.h gui_beval.obj : gui_beval.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ diff --git a/src/Makefile b/src/Makefile index 1326cf06ef..f460a6158c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -466,9 +466,6 @@ CClink = $(CC) # Uncomment this when you do not want inter process communication. #CONF_OPT_CHANNEL = --disable-channel -# SNIFF - Include support for SNiFF+. -#CONF_OPT_SNIFF = --enable-sniff - # MULTIBYTE - To edit multi-byte characters. # Uncomment this when you want to edit a multibyte language. # It's automatically enabled with normal features, GTK or IME support. @@ -1391,7 +1388,7 @@ OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS) LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(TCL_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca -LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)=" +LINT_EXTRA = -DHANGUL_INPUT -D"__attribute__(x)=" DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS) @@ -1532,14 +1529,13 @@ SRC = $(BASIC_SRC) \ $(PYTHON_SRC) $(PYTHON3_SRC) \ $(TCL_SRC) \ $(RUBY_SRC) \ - $(SNIFF_SRC) \ $(WORKSHOP_SRC) \ $(WSDEBUG_SRC) TAGS_SRC = *.c *.cpp if_perl.xs EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ - if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \ + if_python.c if_python3.c if_tcl.c if_ruby.c \ gui_beval.c workshop.c wsdebug.c integration.c \ netbeans.c channel.c \ $(GRESOURCE_SRC) @@ -1561,7 +1557,7 @@ ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) $(EXTRA_SRC) # The perl sources also don't work well with lint. LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) \ $(PYTHON_SRC) $(PYTHON3_SRC) $(TCL_SRC) \ - $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) \ + $(WORKSHOP_SRC) $(WSDEBUG_SRC) \ $(NETBEANS_SRC) $(CHANNEL_SRC) #LINT_SRC = $(SRC) #LINT_SRC = $(ALL_SRC) @@ -1611,7 +1607,6 @@ OBJ_COMMON = \ objects/sha256.o \ objects/spell.o \ objects/syntax.o \ - $(SNIFF_OBJ) \ objects/tag.o \ objects/term.o \ objects/ui.o \ @@ -1750,7 +1745,7 @@ config auto/config.mk: auto/configure config.mk.in config.h.in $(CONF_OPT_TCL) $(CONF_OPT_RUBY) $(CONF_OPT_NLS) \ $(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \ $(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \ - $(CONF_OPT_SNIFF) $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \ + $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \ $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \ $(CONF_OPT_CHANNEL) \ $(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \ @@ -2815,9 +2810,6 @@ objects/if_python3.o: if_python3.c if_py_both.h objects/if_ruby.o: if_ruby.c $(CCC) $(RUBY_CFLAGS) -o $@ if_ruby.c -objects/if_sniff.o: if_sniff.c - $(CCC) -o $@ if_sniff.c - objects/if_tcl.o: if_tcl.c $(CCC) $(TCL_CFLAGS) -o $@ if_tcl.c @@ -3364,10 +3356,6 @@ objects/if_ruby.o: if_ruby.c auto/config.h vim.h feature.h os_unix.h auto/osdef. ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ farsi.h arabic.h version.h -objects/if_sniff.o: if_sniff.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ - regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ - globals.h farsi.h arabic.h os_unixx.h objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ diff --git a/src/auto/configure b/src/auto/configure index a528ccbef3..861fe4d947 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -653,8 +653,6 @@ X_PRE_LIBS X_CFLAGS XMKMF xmkmfpath -SNIFF_OBJ -SNIFF_SRC CHANNEL_OBJ CHANNEL_SRC NETBEANS_OBJ @@ -812,7 +810,6 @@ enable_cscope enable_workshop enable_netbeans enable_channel -enable_sniff enable_multibyte enable_hangulinput enable_xim @@ -1477,7 +1474,6 @@ Optional Features: --enable-workshop Include Sun Visual Workshop support. --disable-netbeans Disable NetBeans integration support. --disable-channel Disable process communication support. - --enable-sniff Include Sniff interface. --enable-multibyte Include multibyte editing support. --enable-hangulinput Include Hangul input support. --enable-xim Include XIM input support. @@ -7439,26 +7435,6 @@ if test "$enable_channel" = "yes"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-sniff argument" >&5 -$as_echo_n "checking --enable-sniff argument... " >&6; } -# Check whether --enable-sniff was given. -if test "${enable_sniff+set}" = set; then : - enableval=$enable_sniff; -else - enable_sniff="no" -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sniff" >&5 -$as_echo "$enable_sniff" >&6; } -if test "$enable_sniff" = "yes"; then - $as_echo "#define FEAT_SNIFF 1" >>confdefs.h - - SNIFF_SRC="if_sniff.c" - - SNIFF_OBJ="objects/if_sniff.o" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-multibyte argument" >&5 $as_echo_n "checking --enable-multibyte argument... " >&6; } # Check whether --enable-multibyte was given. diff --git a/src/charset.c b/src/charset.c index 2414b2a401..ad3f8bcfd7 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1761,8 +1761,7 @@ skiptowhite(char_u *p) return p; } -#if defined(FEAT_LISTCMDS) || defined(FEAT_SIGNS) || defined(FEAT_SNIFF) \ - || defined(PROTO) +#if defined(FEAT_LISTCMDS) || defined(FEAT_SIGNS) || defined(PROTO) /* * skiptowhite_esc: Like skiptowhite(), but also skip escaped chars */ diff --git a/src/config.h.in b/src/config.h.in index fd45c7332b..dc0e9b2adc 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -362,9 +362,6 @@ /* Define for linking via dlopen() or LoadLibrary() */ #undef DYNAMIC_TCL -/* Define if you want to include the Sniff interface. */ -#undef FEAT_SNIFF - /* Define if you want to add support for ACL */ #undef HAVE_POSIX_ACL #undef HAVE_SOLARIS_ZFS_ACL diff --git a/src/config.mk.in b/src/config.mk.in index b514f2bc26..7c0726c296 100644 --- a/src/config.mk.in +++ b/src/config.mk.in @@ -99,9 +99,6 @@ RUBY_PRO = @RUBY_PRO@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_LIBS = @RUBY_LIBS@ -SNIFF_SRC = @SNIFF_SRC@ -SNIFF_OBJ = @SNIFF_OBJ@ - AWK = @AWK@ STRIP = @STRIP@ diff --git a/src/configure.in b/src/configure.in index acbccdea39..fbfa37fe63 100644 --- a/src/configure.in +++ b/src/configure.in @@ -2021,19 +2021,6 @@ if test "$enable_channel" = "yes"; then AC_SUBST(CHANNEL_OBJ) fi -AC_MSG_CHECKING(--enable-sniff argument) -AC_ARG_ENABLE(sniff, - [ --enable-sniff Include Sniff interface.], , - [enable_sniff="no"]) -AC_MSG_RESULT($enable_sniff) -if test "$enable_sniff" = "yes"; then - AC_DEFINE(FEAT_SNIFF) - SNIFF_SRC="if_sniff.c" - AC_SUBST(SNIFF_SRC) - SNIFF_OBJ="objects/if_sniff.o" - AC_SUBST(SNIFF_OBJ) -fi - AC_MSG_CHECKING(--enable-multibyte argument) AC_ARG_ENABLE(multibyte, [ --enable-multibyte Include multibyte editing support.], , diff --git a/src/edit.c b/src/edit.c index 60b6523374..626d3272c2 100644 --- a/src/edit.c +++ b/src/edit.c @@ -1052,12 +1052,6 @@ doESCkey: case K_SELECT: /* end of Select mode mapping - ignore */ break; -#ifdef FEAT_SNIFF - case K_SNIFF: /* Sniff command received */ - stuffcharReadbuff(K_SNIFF); - goto doESCkey; -#endif - case K_HELP: /* Help key works like <ESC> <Help> */ case K_F1: case K_XF1: diff --git a/src/eval.c b/src/eval.c index a6486374b2..f69e814310 100644 --- a/src/eval.c +++ b/src/eval.c @@ -13930,9 +13930,6 @@ f_has(typval_T *argvars, typval_T *rettv) #ifdef FEAT_SMARTINDENT "smartindent", #endif -#ifdef FEAT_SNIFF - "sniff", -#endif #ifdef STARTUPTIME "startuptime", #endif diff --git a/src/ex_cmds.h b/src/ex_cmds.h index 23c26fafbe..d17f4d54e1 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -1281,9 +1281,6 @@ EX(CMD_smenu, "smenu", ex_menu, EX(CMD_snext, "snext", ex_next, RANGE|NOTADR|BANG|FILES|EDITCMD|ARGOPT|TRLBAR, ADDR_LINES), -EX(CMD_sniff, "sniff", ex_sniff, - EXTRA|TRLBAR, - ADDR_LINES), EX(CMD_snomagic, "snomagic", ex_submagic, RANGE|WHOLEFOLD|EXTRA|CMDWIN, ADDR_LINES), diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 3f8c50816c..88257ccddd 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -131,9 +131,6 @@ do_debug(char_u *cmd) redir_off = TRUE; /* don't redirect debug commands */ State = NORMAL; -#ifdef FEAT_SNIFF - want_sniff_request = 0; /* No K_SNIFF wanted */ -#endif if (!debug_did_msg) MSG(_("Entering Debug mode. Type \"cont\" to continue.")); @@ -151,9 +148,7 @@ do_debug(char_u *cmd) { msg_scroll = TRUE; need_wait_return = FALSE; -#ifdef FEAT_SNIFF - ProcessSniffRequests(); -#endif + /* Save the current typeahead buffer and replace it with an empty one. * This makes sure we get input from the user here and don't interfere * with the commands being executed. Reset "ex_normal_busy" to avoid diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 1f493ad1e6..9900c1b6de 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -296,9 +296,6 @@ static void ex_popup(exarg_T *eap); # define ex_rubydo ex_ni # define ex_rubyfile ex_ni #endif -#ifndef FEAT_SNIFF -# define ex_sniff ex_ni -#endif #ifndef FEAT_KEYMAP # define ex_loadkeymap ex_ni #endif @@ -641,9 +638,6 @@ do_exmode( /* Ignore scrollbar and mouse events in Ex mode */ ++hold_gui_events; #endif -#ifdef FEAT_SNIFF - want_sniff_request = 0; /* No K_SNIFF wanted */ -#endif MSG(_("Entering Ex mode. Type \"visual\" to go to Normal mode.")); while (exmode_active) @@ -661,9 +655,6 @@ do_exmode( changedtick = curbuf->b_changedtick; prev_msg_row = msg_row; prev_line = curwin->w_cursor.lnum; -#ifdef FEAT_SNIFF - ProcessSniffRequests(); -#endif if (improved) { cmdline_row = msg_row; diff --git a/src/ex_getln.c b/src/ex_getln.c index 6741e1119c..8db37d9977 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -206,9 +206,6 @@ getcmdline( struct cmdline_info save_ccline; #endif -#ifdef FEAT_SNIFF - want_sniff_request = 0; -#endif #ifdef FEAT_EVAL if (firstc == -1) { diff --git a/src/feature.h b/src/feature.h index 4150f07b5e..f753227562 100644 --- a/src/feature.h +++ b/src/feature.h @@ -1221,7 +1221,6 @@ * +perl Perl interface: "--enable-perlinterp" * +python Python interface: "--enable-pythoninterp" * +tcl TCL interface: "--enable-tclinterp" - * +sniff Sniff interface: "--enable-sniff" * +sun_workshop Sun Workshop integration * +netbeans_intg Netbeans integration * +channel Inter process communication diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 440b401ab1..69e4e1824e 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -6460,22 +6460,6 @@ input_timer_cb(gpointer data) return FALSE; /* don't happen again */ } -#ifdef FEAT_SNIFF -/* - * Callback function, used when data is available on the SNiFF connection. - */ - static void -sniff_request_cb( - gpointer data UNUSED, - gint source_fd UNUSED, - GdkInputCondition condition UNUSED) -{ - static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF}; - - add_to_input_buf(bytes, 3); -} -#endif - /* * GUI input routine called by gui_wait_for_chars(). Waits for a character * from the keyboard. @@ -6491,26 +6475,6 @@ gui_mch_wait_for_chars(long wtime) int focus; guint timer; static int timed_out; -#ifdef FEAT_SNIFF - static int sniff_on = 0; - static gint sniff_input_id = 0; -#endif - -#ifdef FEAT_SNIFF - if (sniff_on && !want_sniff_request) - { - if (sniff_input_id) - gdk_input_remove(sniff_input_id); - sniff_on = 0; - } - else if (!sniff_on && want_sniff_request) - { - /* Add fd_from_sniff to watch for available data in main loop. */ - sniff_input_id = gdk_input_add(fd_from_sniff, - GDK_INPUT_READ, sniff_request_cb, NULL); - sniff_on = 1; - } -#endif timed_out = FALSE; diff --git a/src/gui_w32.c b/src/gui_w32.c index aff0ba26aa..6cc2e06988 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -326,7 +326,7 @@ static int s_findrep_is_find; /* TRUE for find dialog, FALSE #endif static HINSTANCE s_hinst = NULL; -#if !defined(FEAT_SNIFF) && !defined(FEAT_GUI) +#if !defined(FEAT_GUI) static #endif HWND s_hwnd = NULL; @@ -1927,23 +1927,6 @@ process_message(void) } #endif -#ifdef FEAT_SNIFF - if (sniff_request_waiting && want_sniff_request) - { - static char_u bytes[3] = {CSI, (char_u)KS_EXTRA, (char_u)KE_SNIFF}; - add_to_input_buf(bytes, 3); /* K_SNIFF */ - sniff_request_waiting = 0; - want_sniff_request = 0; - /* request is handled in normal.c */ - } - if (msg.message == WM_USER) - { - MyTranslateMessage(&msg); - pDispatchMessage(&msg); - return; - } -#endif - #ifdef MSWIN_FIND_REPLACE /* Don't process messages used by the dialog */ if (s_findrep_hwnd != NULL && pIsDialogMessage(s_findrep_hwnd, &msg)) diff --git a/src/gui_x11.c b/src/gui_x11.c index 5a0fe8d527..b525cf7a68 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -145,9 +145,6 @@ static void gui_x11_focus_change_cb(Widget w, XtPointer data, XEvent *event, Boo static void gui_x11_enter_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum); static void gui_x11_leave_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum); static void gui_x11_mouse_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum); -#ifdef FEAT_SNIFF -static void gui_x11_sniff_request_cb(XtPointer closure, int *source, XtInputId *id); -#endif static void gui_x11_check_copy_area(void); #ifdef FEAT_CLIENTSERVER static void gui_x11_send_event_handler(Widget, XtPointer, XEvent *, Boolean *); @@ -1163,20 +1160,6 @@ gui_x11_mouse_cb( gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers); } -#ifdef FEAT_SNIFF -/* ARGSUSED */ - static void -gui_x11_sniff_request_cb( - XtPointer closure UNUSED, - int *source UNUSED, - XtInputId *id UNUSED) -{ - static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF}; - - add_to_input_buf(bytes, 3); -} -#endif - /* * End of call-back routines */ @@ -2818,28 +2801,9 @@ gui_mch_wait_for_chars(long wtime) static int timed_out; XtIntervalId timer = (XtIntervalId)0; XtInputMask desired; -#ifdef FEAT_SNIFF - static int sniff_on = 0; - static XtInputId sniff_input_id = 0; -#endif timed_out = FALSE; -#ifdef FEAT_SNIFF - if (sniff_on && !want_sniff_request) - { - if (sniff_input_id) - XtRemoveInput(sniff_input_id); - sniff_on = 0; - } - else if (!sniff_on && want_sniff_request) - { - sniff_input_id = XtAppAddInput(app_context, fd_from_sniff, - (XtPointer)XtInputReadMask, gui_x11_sniff_request_cb, 0); - sniff_on = 1; - } -#endif - if (wtime > 0) timer = XtAppAddTimeOut(app_context, (long_u)wtime, gui_x11_timer_cb, &timed_out); diff --git a/src/if_sniff.c b/src/if_sniff.c deleted file mode 100644 index 85c4755afb..0000000000 --- a/src/if_sniff.c +++ /dev/null @@ -1,1201 +0,0 @@ -/* vi:set ts=8 sts=4 sw=4: - * - * if_sniff.c Interface between Vim and SNiFF+ - * - * See README.txt for an overview of the Vim source code. - */ - -#include "vim.h" - -#ifdef WIN32 -# include <stdio.h> -# include <process.h> -# include <string.h> -# include <assert.h> -#else -# ifdef FEAT_GUI_X11 -# include "gui_x11.pro" -# endif -# include "os_unixx.h" -#endif - -static int sniffemacs_pid; - -int fd_from_sniff; -int sniff_connected = 0; -int sniff_request_waiting = 0; -int want_sniff_request = 0; - -#define MAX_REQUEST_LEN 512 - -#define NEED_SYMBOL 2 -#define EMPTY_SYMBOL 4 -#define NEED_FILE 8 -#define SILENT 16 -#define DISCONNECT 32 -#define CONNECT 64 - -#define RQ_NONE 0 -#define RQ_SIMPLE 1 -#define RQ_CONTEXT NEED_FILE + NEED_SYMBOL -#define RQ_SCONTEXT NEED_FILE + NEED_SYMBOL + EMPTY_SYMBOL -#define RQ_NOSYMBOL NEED_FILE -#define RQ_SILENT RQ_NOSYMBOL + SILENT -#define RQ_CONNECT RQ_NONE + CONNECT -#define RQ_DISCONNECT RQ_SIMPLE + DISCONNECT - -struct sn_cmd -{ - char *cmd_name; - char cmd_code; - char *cmd_msg; - int cmd_type; -}; - -struct sn_cmd_list -{ - struct sn_cmd* sniff_cmd; - struct sn_cmd_list* next_cmd; -}; - -static struct sn_cmd sniff_cmds[] = -{ - { "toggle", 'e', N_("Toggle implementation/definition"),RQ_SCONTEXT }, |