diff options
| author | June McEnroe <june@causal.agency> | 2019-11-21 17:02:53 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2019-11-21 17:02:53 -0500 |
| commit | 19fe5cb6e2271709f954f2c6c12ade4d8885e30f (patch) | |
| tree | ea1be92fc557897b077eef67e3f58b7ccc293f85 | |
| parent | Just use H_LOAD and H_SAVE (diff) | |
| download | src-19fe5cb6e2271709f954f2c6c12ade4d8885e30f.tar.gz src-19fe5cb6e2271709f954f2c6c12ade4d8885e30f.zip | |
Revert "Use local libedit"
This reverts commit a8cd87a52b91f41d3bec81b1a36fa224501f3af7.
| -rw-r--r-- | bin/1sh/Makefile | 9 | ||||
| -rw-r--r-- | bin/1sh/histedit.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/bin/1sh/Makefile b/bin/1sh/Makefile index 547079ad..afd0350b 100644 --- a/bin/1sh/Makefile +++ b/bin/1sh/Makefile @@ -1,8 +1,8 @@ PREFIX = /usr/local MANDIR = ${PREFIX}/share/man -CFLAGS += -std=c99 -Wall -Wextra -DSHELL -Ilibedit -LDLIBS = -lcurses +CFLAGS += -std=c99 -Wall -Wextra -DSHELL +LDLIBS = -ledit -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} libedit/libedit.a +OBJS = ${SRCS:.c=.o} MANS = 1sh.1 1sh-kill.1 1sh-printf.1 1sh-test.1 @@ -49,9 +49,6 @@ all: tags 1sh ${OBJS}: ${GENHDRS} -libedit/libedit.a: - ${MAKE} -C libedit libedit.a - builtins.c builtins.h: mkbuiltins builtins.def sh mkbuiltins . diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c index 4c0821dd..32e798e3 100644 --- a/bin/1sh/histedit.c +++ b/bin/1sh/histedit.c @@ -129,7 +129,7 @@ histedit(void) el_set(el, EL_RPROMPT, getrprompt); el_set(el, EL_ADDFN, "sh-complete", "Filename completion", - _el_fn_complete); + _el_fn_sh_complete); } else { bad: out2fmt_flush("sh: can't initialize editing\n"); |