From 3f99c55cfc1cb5d824c46697d257cbf3d19d5d65 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Thu, 21 Nov 2019 17:02:53 -0500 Subject: Revert "Use local libedit" This reverts commit 4ec42616876188657fde1230f7c2ccd8396f18b1. --- bin/1sh/Makefile | 9 +++------ bin/1sh/histedit.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'bin') 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"); -- cgit 1.4.1 alue='d0179695c4f2f14934c525c4881da7fff9459af5'/>
path: root/bin/1sh/mksyntax.c (unfollow)
Commit message (Expand)Author
2019-08-27Cast %lc parameter to wint_tJune McEnroe
2019-08-27Remove host thursdayJune McEnroe
2019-08-22Add cards to causal.agencyJune McEnroe
2019-08-20Add Record of a Spaceborn FewJune McEnroe
2019-08-13Add The Calculating StarsJune McEnroe
2019-08-12Make dtch one command, add sinkingJune McEnroe
2019-08-03Add ImagoJune McEnroe
2019-07-29Add KindredJune McEnroe
2019-07-27Clean up home filesJune McEnroe
2019-07-27Fix shell script style in ~/.local/binJune McEnroe
2019-07-27Shell script style passJune McEnroe
2019-07-27Add c11.pdfJune McEnroe
2019-07-27Move pdf script to MakefileJune McEnroe
2019-07-27Update macOS neovim to 0.3.8June McEnroe
2019-07-27Rewrite port makefiles consistentlyJune McEnroe
2019-07-27Rewrite Makefile once more with more organizationJune McEnroe
2019-07-27Reference png.h in bin.7June McEnroe
2019-07-27Revert "Use scheme to style HTMLs"June McEnroe
2019-07-27Remove scheme text linkJune McEnroe
2019-07-26Update Dark.terminalJune McEnroe
2019-07-26Lighten dark whiteJune McEnroe
2019-07-25Add png.3 man pageJune McEnroe
2019-07-25Use scheme to style HTMLsJune McEnroe
2019-07-25Don't match comments in strings in makeJune McEnroe
2019-07-25Generate index.html with links from bin.7June McEnroe
2019-07-24Warn when date has changedJune McEnroe
2019-07-24Add whenJune McEnroe
2019-07-24Remove histedit from bitJune McEnroe