diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index a99763cc920..7ecca79081d 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,5 +1,5 @@
 PROG=	ed
-SRCS=	 buf.c cbc.c glob.c io.c main.c re.c sub.c undo.c
+SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=  ${BINDIR}/ed ${BINDIR}/red
 MLINKS= ed.1 red.1
 
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 751306475b6..70275990c9a 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -26,10 +26,11 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "@(#)$Id: buf.c,v 1.3 1993/12/14 16:19:56 alm Exp $";
+static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
 #endif /* not lint */
 
 #include <sys/file.h>
+#include <sys/stat.h>
 
 #include "ed.h"
 
@@ -131,7 +132,7 @@ add_line_node(lp)
 	line_t *cp;
 
 	cp = get_addressed_line_node(current_addr);				/* this get_addressed_line_node last! */
-	insque(lp, cp);
+	INSQUE(lp, cp);
 	addr_last++;
 	current_addr++;
 }
@@ -195,13 +196,18 @@ char sfn[15] = "";				/* scratch file name */
 int
 open_sbuf()
 {
+	int u;
+
 	isbinary = newline_added = 0;
+	u = umask(077);
 	strcpy(sfn, "/tmp/ed.XXXXXX");
 	if (mktemp(sfn) == NULL || (sfp = fopen(sfn, "w+")) == NULL) {
 		fprintf(stderr, "%s: %s\n", sfn, strerror(errno));
 		sprintf(errmsg, "cannot open temp file");
+		umask(u);
 		return ERR;
 	}
+	umask(u);
 	return 0;
 }
 
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 3359b2b85f0..ee5285cdd0e 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -38,7 +38,7 @@
  */
 
 #ifndef lint
-static char *rcsid = "@(#)$Id: cbc.c,v 1.3 1993/12/14 18:01:10 alm Exp $";
+static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 3bc77b0979c..27f8b36aebb 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,20 +1,21 @@
 .TH ED 1 "21 May 1993"
 .SH NAME
-ed, red \- text editor
+.\" ed, red \- text editor
+ed \- text editor
 .SH SYNOPSIS
 ed [-] [-sx] [-p \fIstring\fR] [\fIfile\fR]
-.LP
-red [-] [-sx] [-p \fIstring\fR] [\fIfile\fR]
+.\" .LP
+.\" red [-] [-sx] [-p \fIstring\fR] [\fIfile\fR]
 .SH DESCRIPTION
 .B ed
 is a line-oriented text editor.
 It is used to create, display, modify and otherwise manipulate text
 files.
-.B red
-is a restricted
-.BR ed :
-it can only edit files in the current
-directory and cannot execute shell commands.
+.\" .B red
+.\" is a restricted
+.\" .BR ed :
+.\" it can only edit files in the current
+.\" directory and cannot execute shell commands.
 
 If invoked with a
 .I file
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index ddf86fff320..dd638806c47 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -24,14 +24,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)$Id: ed.h,v 1.4 1993/12/15 15:22:02 alm Exp alm $
+ *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
  */
 
+#include <sys/types.h>
 #if defined(BSD) && BSD >= 199103 || defined(__386BSD__)
 # include <sys/param.h>		/* for MAXPATHLEN */
 #endif
 #include <errno.h>
-#ifdef sun
+#if defined(sun) || defined(__NetBSD__)
 # include <limits.h>
 #endif
 #include <regex.h>
@@ -166,17 +167,15 @@ if ((i) > (n)) { \
 /* REQUE: link pred before succ */
 #define REQUE(pred, succ) (pred)->q_forw = (succ), (succ)->q_back = (pred)
 
-#ifdef NEED_INSQUE
-/* insque: insert elem in circular queue after pred */
-#define insque(elem, pred) \
+/* INSQUE: insert elem in circular queue after pred */
+#define INSQUE(elem, pred) \
 { \
 	REQUE((elem), (pred)->q_forw); \
 	REQUE((pred), elem); \
 }
 
-/* remque: remove_lines elem from circular queue */
-#define remque(elem) REQUE((elem)->q_back, (elem)->q_forw);
-#endif /* NEED_INSQUE */
+/* REMQUE: remove_lines elem from circular queue */
+#define REMQUE(elem) REQUE((elem)->q_back, (elem)->q_forw);
 
 /* NUL_TO_NEWLINE: overwrite ASCII NULs with newlines */
 #define NUL_TO_NEWLINE(s, l) translit_text(s, l, '\0', '\n')
@@ -184,7 +183,7 @@ if ((i) > (n)) { \
 /* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */
 #define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0')
 
-#ifndef strerror
+#ifdef sun
 # define strerror(n) sys_errlist[n]
 #endif
 
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
new file mode 100644
index 00000000000..1e21d99d287
--- /dev/null
+++ b/bin/ed/glbl.c
@@ -0,0 +1,223 @@
+/* glob.c: This file contains the global command routines for the ed line
+   editor */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char *rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
+#endif /* not lint */
+
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+
+#include "ed.h"
+
+
+/* build_active_list:  add line matching a pattern to the global-active list */
+int
+build_active_list(isgcmd)
+	int isgcmd;
+{
+	pattern_t *pat;
+	line_t *lp;
+	long n;
+	char *s;
+	char delimiter;
+
+	if ((delimiter = *ibufp) == ' ' || delimiter == '\n') {
+		sprintf(errmsg, "invalid pattern delimiter");
+		return ERR;
+	} else if ((pat = get_compiled_pattern()) == NULL)
+		return ERR;
+	else if (*ibufp == delimiter)
+		ibufp++;
+	clear_active_list();
+	lp = get_addressed_line_node(first_addr);
+	for (n = first_addr; n <= second_addr; n++, lp = lp->q_forw) {
+		if ((s = get_sbuf_line(lp)) == NULL)
+			return ERR;
+		if (isbinary)
+			NUL_TO_NEWLINE(s, lp->len);
+		if (!regexec(pat, s, 0, NULL, 0) == isgcmd &&
+		    set_active_node(lp) < 0)
+			return ERR;
+	}
+	return 0;
+}
+
+
+/* exec_global: apply command list in the command buffer to the active
+   lines in a range; return command status */
+long
+exec_global(interact, gflag)
+	int interact;
+	int gflag;
+{
+	static char *ocmd = NULL;
+	static int ocmdsz = 0;
+
+	line_t *lp = NULL;
+	int status;
+	int n;
+	char *cmd = NULL;
+
+#ifdef BACKWARDS
+	if (!interact)
+		if (!strcmp(ibufp, "\n"))
+			cmd = "p\n";		/* null cmd-list == `p' */
+		else if ((cmd = get_extended_line(&n, 0)) == NULL)
+			return ERR;
+#else
+	if (!interact && (cmd = get_extended_line(&n, 0)) == NULL)
+		return ERR;
+#endif
+	clear_undo_stack();
+	while ((lp = next_active_node()) != NULL) {
+		if ((current_addr = get_line_node_addr(lp)) < 0)
+			return ERR;
+		if (interact) {
+			/* print current_addr; get a command in global syntax */
+			if (display_lines(current_addr, current_addr, gflag) < 0)
+				return ERR;
+			while ((n = get_tty_line()) > 0 &&
+			    ibuf[n - 1] != '\n')
+				clearerr(stdin);
+			if (n < 0)
+				return ERR;
+			else if (n == 0) {
+				sprintf(errmsg, "unexpected end-of-file");
+				return ERR;
+			} else if (n == 1 && !strcmp(ibuf, "\n"))
+				continue;
+			else if (n == 2 && !strcmp(ibuf, "&\n")) {
+				if (cmd == NULL) {
+					sprintf(errmsg, "no previous command");
+					return ERR;
+				} else cmd = ocmd;
+			} else if ((cmd = get_extended_line(&n, 0)) == NULL)
+				return ERR;
+			else {
+				REALLOC(ocmd, ocmdsz, n + 1, ERR);
+				memcpy(ocmd, cmd, n + 1);
+				cmd = ocmd;
+			}
+
+		}
+		ibufp = cmd;
+		for (; *ibufp;)
+			if ((status = extract_addr_range()) < 0 ||
+			    (status = exec_command()) < 0 ||
+			    status > 0 && (status = display_lines(
+			    current_addr, current_addr, status)) < 0)
+				return status;
+	}
+	return 0;
+}
+
+
+line_t **active_list;		/* list of lines active in a global command */
+long active_last;		/* index of last active line in active_list */
+long active_size;		/* size of active_list */
+long active_ptr;		/* active_list index (non-decreasing) */
+long active_ndx;		/* active_list index (modulo active_last) */
+
+/* set_active_node: add a line node to the global-active list */
+int
+set_active_node(lp)
+	line_t *lp;
+{
+	if (active_last + 1 > active_size) {
+		int ti = active_size;
+		line_t **ts;
+		SPL1();
+#if defined(sun) || defined(NO_REALLOC_NULL)
+		if (active_list != NULL) {
+#endif
+			if ((ts = (line_t **) realloc(active_list, 
+			    (ti += MINBUFSZ) * sizeof(line_t **))) == NULL) {
+				fprintf(stderr, "%s\n", strerror(errno));
+				sprintf(errmsg, "out of memory");
+				SPL0();
+				return ERR;
+			}
+#if defined(sun) || defined(NO_REALLOC_NULL)
+		} else {
+			if ((ts = (line_t **) malloc((ti += MINBUFSZ) * 
+			    sizeof(line_t **))) == NULL) {
+				fprintf(stderr, "%s\n", strerror(errno));
+				sprintf(errmsg, "out of memory");
+				SPL0();
+				return ERR;
+			}
+		}
+#endif
+		active_size = ti;
+		active_list = ts;
+		SPL0();
+	}
+	active_list[active_last++] = lp;
+	return 0;
+}
+
+
+/* unset_active_nodes: remove a range of lines from the global-active list */
+void
+unset_active_nodes(np, mp)
+	line_t *np, *mp;
+{
+	line_t *lp;
+	long i;
+
+	for (lp = np; lp != mp; lp = lp->q_forw)
+		for (i = 0; i < active_last; i++)
+			if (active_list[active_ndx] == lp) {
+				active_list[active_ndx] = NULL;
+				active_ndx = INC_MOD(active_ndx, active_last - 1);
+				break;
+			} else	active_ndx = INC_MOD(active_ndx, active_last - 1);
+}
+
+
+/* next_active_node: return the next global-active line node */
+line_t *
+next_active_node()
+{
+	while (active_ptr < active_last && active_list[active_ptr] == NULL)
+		active_ptr++;
+	return (active_ptr < active_last) ? active_list[active_ptr++] : NULL;
+}
+
+
+/* clear_active_list: clear the global-active list */
+void
+clear_active_list()
+{
+	SPL1();
+	active_size = active_last = active_ptr = active_ndx = 0;
+	free(active_list);
+	active_list = NULL;
+	SPL0();
+}
diff --git a/bin/ed/io.c b/bin/ed/io.c
index d0d56c1ef00..2187cb99941 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char *rcsid = "@(#)$Id: io.c,v 1.3 1993/12/14 16:19:56 alm Exp $";
+static char *rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/main.c b/bin/ed/main.c
index fe970019eb5..f177b86ecd9 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -33,7 +33,7 @@ char *copyright =
 #endif /* not lint */
 
 #ifndef lint
-static char *rcsid = "@(#)$Id: main.c,v 1.5 1993/12/15 15:22:02 alm Exp alm $";
+static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #endif /* not lint */
 
 /*
diff --git a/bin/ed/re.c b/bin/ed/re.c
index d0d4e6c0e20..0e04dd83dd9 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static char *rcsid = "@(#)$Id: re.c,v 1.2 1993/12/14 16:19:56 alm Exp $";
+static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 6d01650f7da..9d46a7ca3d2 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static char *rcsid = "@(#)$Id: sub.c,v 1.3 1993/12/15 15:22:02 alm Exp alm $";
+static char *rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 9dea62163d0..a686d14c1b3 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char *rcsid = "@(#)$Id: undo.c,v 1.2 1993/12/14 16:19:56 alm Exp $";
+static char *rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"