From 4ec42616876188657fde1230f7c2ccd8396f18b1 Mon Sep 17 00:00:00 2001 From: June McEnroe 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 ter
path: root/term.c (unfollow)
Commit message (Expand)Author
2018-11-27Rename project catgirlJune McEnroe
2018-11-27Add M-m key to insert a blank lineJune McEnroe
2018-10-28Add notification with notify-sendJune McEnroe
2018-10-28Use const char *argv[] signaturesJune McEnroe
2018-10-23Fix verbose view name in man pageJune McEnroe
2018-10-22Add more URL schemesJune McEnroe
2018-10-22Rework status lineJune McEnroe
2018-10-22Rename status and verbose tagsJune McEnroe
2018-09-16Revert "Race parallel connects"June McEnroe
2018-09-16Race parallel connectsJune McEnroe
2018-09-15Call tls_error when tls_connect_socket failsJune McEnroe
2018-09-15Try successive getaddrinfo resultsJune McEnroe
2018-09-15Render README from chatte.7June McEnroe
2018-09-14Factor out uiPrompt to call on nick changeJune McEnroe
2018-09-14Run test binaries with set -e and semicolonsJune McEnroe
2018-09-14Fail target when any test binary failsJune McEnroe
2018-09-14Run tests in default targetJune McEnroe
2018-09-14Add termEvent testsJune McEnroe
2018-09-14Check width of entire next word including codesJune McEnroe
2018-09-14Remove word handling from formatParseJune McEnroe
2018-09-14Apply consecutive formatting codes at onceJune McEnroe
2018-09-14Add tests for formatParseJune McEnroe
2018-09-13Preview with nick in input windowJune McEnroe
2018-09-13Never send PRIVMSG to TagStatus or TagVerboseJune McEnroe
2018-09-13Move color selection to format.cJune McEnroe
2018-09-13Fix len for format->split at end of stringJune McEnroe
2018-09-13Avoid uninitialized x in uiReadJune McEnroe
2018-09-13Add IRCDefault to colors enumJune McEnroe
2018-09-13Return a format->split even at the end of the stringJune McEnroe
2018-09-13Fix weird tab-complete after commaJune McEnroe
2018-09-13Rewrite UI againJune McEnroe
2018-09-12Add note about C-oJune McEnroe
2018-09-12Use formatParse split to position input cursorJune McEnroe
2018-09-12Factor out IRC formatting parsingJune McEnroe
2018-09-11Add /help equivalent to /manJune McEnroe
2018-09-11Don't render every PM as a pingJune McEnroe
2018-09-11Add urlOpenMatchJune McEnroe
2018-09-10Depend on man.sh for chroot.tar targetJune McEnroe
2018-09-10Set LESSSECURE=1 in man.shJune McEnroe
2018-09-10Add /man commandJune McEnroe
2018-09-10Install man page in chrootJune McEnroe
2018-09-10Install man pageJune McEnroe
2018-09-10Split keys into subsections and document colorsJune McEnroe
2018-09-10Add "blank" lines to chatte.1June McEnroe
2018-09-10Document key bindings in chatte.1June McEnroe
2018-09-08Document slash commands in chatte.1June McEnroe