From 4ec42616876188657fde1230f7c2ccd8396f18b1 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Sat, 12 Jan 2019 14:29:13 -0500
Subject: Use local libedit

---
 bin/cash/Makefile   | 25 ++++++++++++++-----------
 bin/cash/histedit.c |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/bin/cash/Makefile b/bin/cash/Makefile
index 22b2a1b8..f1f026f0 100644
--- a/bin/cash/Makefile
+++ b/bin/cash/Makefile
@@ -1,8 +1,8 @@
 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
 
-CFLAGS += -std=c99 -Wall -Wextra -DSHELL
-LDLIBS = -ledit
+CFLAGS += -std=c99 -Wall -Wextra -DSHELL -Ilibedit
+LDLIBS = -lcurses
 
 -include config.mk
 
@@ -38,7 +38,7 @@ GENSRCS = builtins.c nodes.c syntax.c
 GENHDRS = builtins.h nodes.h syntax.h token.h
 
 SRCS += $(GENSRCS)
-OBJS = $(SRCS:.c=.o)
+OBJS = $(SRCS:.c=.o) libedit/libedit.a
 
 MAN1 = cash.1 cash-kill.1 cash-printf.1 cash-test.1
 
@@ -47,16 +47,11 @@ all: tags cash
 cash: $(OBJS)
 	$(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
 
-tags: *.h *.c
-	ctags -w *.h *.c
-
-depend: $(SRCS) $(GENHDRS)
-	$(CC) $(CFLAGS) -MM $(SRCS) > .depend
-
--include .depend
-
 $(OBJS): $(GENHDRS)
 
+libedit/libedit.a:
+	$(MAKE) -C libedit libedit.a
+
 builtins.c builtins.h: mkbuiltins builtins.def
 	sh mkbuiltins .
 
@@ -69,6 +64,14 @@ syntax.c syntax.h: mksyntax
 token.h: mktokens
 	sh mktokens
 
+tags: *.h *.c
+	ctags -w *.h *.c
+
+depend: $(SRCS) $(GENHDRS)
+	$(CC) $(CFLAGS) -MM $(SRCS) > .depend
+
+-include .depend
+
 clean:
 	rm -f cash $(OBJS) mknodes mksyntax $(GENSRCS) $(GENHDRS) tags .depend
 
diff --git a/bin/cash/histedit.c b/bin/cash/histedit.c
index 4e8ff8b2..3c77c6e8 100644
--- a/bin/cash/histedit.c
+++ b/bin/cash/histedit.c
@@ -125,7 +125,7 @@ histedit(void)
 				el_set(el, EL_RPROMPT, getrprompt);
 				el_set(el, EL_ADDFN, "sh-complete",
 				    "Filename completion",
-				    _el_fn_sh_complete);
+				    _el_fn_complete);
 			} else {
 bad:
 				out2fmt_flush("sh: can't initialize editing\n");
-- 
cgit 1.4.1