7 files changed, 21 insertions, 64 deletions
diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile
index 7a7977969b3..83062bc2876 100644
--- a/usr.bin/vi/build/Makefile
+++ b/usr.bin/vi/build/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2014/11/06 10:48:52 bentley Exp $
+#	$OpenBSD: Makefile,v 1.20 2014/11/14 20:26:12 tedu Exp $
 #	@(#)Makefile.in	8.75 (Berkeley) 10/23/96
 
 PROG=	vi
@@ -26,7 +26,7 @@ SRCS=	cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c \
 	ex_global.c ex_init.c ex_join.c ex_map.c ex_mark.c ex_mkexrc.c \
 	ex_move.c ex_open.c ex_perl.c ex_preserve.c ex_print.c ex_put.c \
 	ex_quit.c ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \
-	ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c ex_tcl.c \
+	ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c \
 	ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \
 	ex_write.c ex_yank.c ex_z.c exf.c getc.c key.c line.c log.c main.c \
 	mark.c msg.c options.c options_f.c put.c recover.c screen.c \
diff --git a/usr.bin/vi/common/gs.h b/usr.bin/vi/common/gs.h
index 9466c23dafb..68b1b73d085 100644
--- a/usr.bin/vi/common/gs.h
+++ b/usr.bin/vi/common/gs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gs.h,v 1.11 2013/12/01 20:22:34 krw Exp $	*/
+/*	$OpenBSD: gs.h,v 1.12 2014/11/14 20:26:12 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -64,7 +64,6 @@ struct _gs {
 	SCR	*ccl_sp;		/* Colon command-line screen. */
 
 	void	*perl_interp;		/* Perl interpreter. */
-	void	*tcl_interp;		/* Tcl_Interp *: Tcl interpreter. */
 
 	void	*cl_private;		/* Curses support private area. */
 	void	*ip_private;		/* IP support private area. */
diff --git a/usr.bin/vi/docs/help b/usr.bin/vi/docs/help
index a7b5d748e04..bcbbafd4163 100644
--- a/usr.bin/vi/docs/help
+++ b/usr.bin/vi/docs/help
@@ -188,7 +188,6 @@ EX COMMANDS:
       tagpop: return to the previous group of tags
      tagprev: move to the previous tag
       tagtop: discard all tags
-	 tcl: run the tcl interpreter with the command
 	undo: undo the most recent change
 unabbreviate: delete an abbreviation
        unmap: delete an input or command map
diff --git a/usr.bin/vi/ex/ex_cmd.c b/usr.bin/vi/ex/ex_cmd.c
index 74989c69112..cafb0440af7 100644
--- a/usr.bin/vi/ex/ex_cmd.c
+++ b/usr.bin/vi/ex/ex_cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_cmd.c,v 1.7 2010/05/29 06:40:00 jmc Exp $	*/
+/*	$OpenBSD: ex_cmd.c,v 1.8 2014/11/14 20:26:13 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -370,12 +370,6 @@ EXCMDLIST const cmds[] = {
 	    "!",
 	    "tagt[op][!]",
 	    "discard all tags"},
-/* C_TCLCMD */
-	{"tcl",		ex_tcl,		E_ADDR2_ALL|E_ADDR_ZERO|
-					    E_ADDR_ZERODEF|E_SECURE,
-	    "s",
-	    "tc[l] cmd",
-	    "run the tcl interpreter with the command"},
 /* C_UNDO */
 	{"undo",	ex_undo,	E_AUTOPRINT,
 	    "",
diff --git a/usr.bin/vi/ex/ex_tcl.c b/usr.bin/vi/ex/ex_tcl.c
deleted file mode 100644
index 67c6af73e91..00000000000
--- a/usr.bin/vi/ex/ex_tcl.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*	$OpenBSD: ex_tcl.c,v 1.7 2014/11/12 04:28:41 bentley Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 1992, 1993, 1994, 1995, 1996
- *	Keith Bostic.  All rights reserved.
- * Copyright (c) 1995
- *	George V. Neville-Neil.  All rights reserved.
- *
- * See the LICENSE file for redistribution information.
- */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <bitstring.h>
-#include <stdio.h>
-
-#include "../common/common.h"
-
-/* 
- * ex_tcl -- :[line [,line]] tcl [command]
- *	Run a command through the tcl interpreter.
- *
- * PUBLIC: int ex_tcl(SCR*, EXCMD *);
- */
-int 
-ex_tcl(SCR *sp, EXCMD *cmdp)
-{
-	msgq(sp, M_ERR, "302|Vi was not loaded with a Tcl interpreter");
-	return (1);
-}
diff --git a/usr.bin/vi/include/ex_def.h b/usr.bin/vi/include/ex_def.h
index 54619330610..d938c7596c1 100644
--- a/usr.bin/vi/include/ex_def.h
+++ b/usr.bin/vi/include/ex_def.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_def.h,v 1.2 2001/01/29 01:58:47 niklas Exp $	*/
+/*	$OpenBSD: ex_def.h,v 1.3 2014/11/14 20:26:13 tedu Exp $	*/
 
 #define C_SCROLL 0
 #define C_BANG 1
@@ -62,19 +62,18 @@
 #define C_TAGPOP 59
 #define C_TAGPREV 60
 #define C_TAGTOP 61
-#define C_TCLCMD 62
-#define C_UNDO 63
-#define C_UNABBREVIATE 64
-#define C_UNMAP 65
-#define C_V 66
-#define C_VERSION 67
-#define C_VISUAL_EX 68
-#define C_VISUAL_VI 69
-#define C_VIUSAGE 70
-#define C_WRITE 71
-#define C_WN 72
-#define C_WQ 73
-#define C_XIT 74
-#define C_YANK 75
-#define C_Z 76
-#define C_SUBTILDE 77
+#define C_UNDO 62
+#define C_UNABBREVIATE 63
+#define C_UNMAP 64
+#define C_V 65
+#define C_VERSION 66
+#define C_VISUAL_EX 67
+#define C_VISUAL_VI 68
+#define C_VIUSAGE 69
+#define C_WRITE 70
+#define C_WN 71
+#define C_WQ 72
+#define C_XIT 73
+#define C_YANK 74
+#define C_Z 75
+#define C_SUBTILDE 76
diff --git a/usr.bin/vi/include/ex_extern.h b/usr.bin/vi/include/ex_extern.h
index de167a3911e..d7914895127 100644
--- a/usr.bin/vi/include/ex_extern.h
+++ b/usr.bin/vi/include/ex_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_extern.h,v 1.10 2013/05/03 20:43:25 kili Exp $	*/
+/*	$OpenBSD: ex_extern.h,v 1.11 2014/11/14 20:26:13 tedu Exp $	*/
 
 int ex(SCR **);
 int ex_cmd(SCR *);
@@ -104,7 +104,6 @@ int tagq_free(SCR *, TAGQ *);
 void tag_msg(SCR *, tagmsg_t, char *);
 int ex_tagf_alloc(SCR *, char *);
 int ex_tag_free(SCR *);
-int ex_tcl(SCR*, EXCMD *);
 int ex_txt(SCR *, TEXTH *, ARG_CHAR_T, u_int32_t);
 int ex_undo(SCR *, EXCMD *);
 int ex_help(SCR *, EXCMD *);