From 3f99c55cfc1cb5d824c46697d257cbf3d19d5d65 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
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

 name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=1fd0682a0f2eea92867b20502c70716b1400f33f&amp;follow=1'>root</a>/<a href='/src/log/bin?id=1fd0682a0f2eea92867b20502c70716b1400f33f&amp;follow=1'>bin</a>/<a href='/src/log/bin/beef.c?id=1fd0682a0f2eea92867b20502c70716b1400f33f&amp;follow=1'>beef.c</a> (<a href='/src/log/bin/beef.c?id=1fd0682a0f2eea92867b20502c70716b1400f33f'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/beef.c?id=1fd0682a0f2eea92867b20502c70716b1400f33f&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-10-12 23:37:16 -0400'>2024-10-12</span></td><td><a href='/src/commit/www/text.causal.agency/Makefile?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>Publish "film review"</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-12 17:53:09 -0400'>2024-10-12</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-06/lens?id=300e2dd0e4cea019f0d247b90226fdf3fa5759c7&amp;follow=1'>Add photos from October 6</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-12 10:28:02 -0400'>2024-10-12</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-05/lens?id=8896a95764f011c24d0817c07e23bfa4887f7da1&amp;follow=1'>Add photos from October 5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-09 22:12:27 -0400'>2024-10-09</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-01/lens?id=a147012a38017ee519ce35b3acbb0e55f3638f7b&amp;follow=1'>Add photos from October 1</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-07 19:16:29 -0400'>2024-10-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-29/lens?id=1dde71aa57ac73f9f15b8a9666c36b2173bb4592&amp;follow=1'>Add photos from September 29</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-07 18:05:03 -0400'>2024-10-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-28/lens?id=078d89ff74d02fd854f8de93fe225e6670644d50&amp;follow=1'>Add photos from September 28</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-07 14:57:20 -0400'>2024-10-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-22/lens?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>Add photos from September 22</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-25 10:05:37 -0400'>2024-09-25</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-15/lens?id=1a4a0628513359733a2450cf38e73166f7e5cbe6&amp;follow=1'>Add photos from September 15</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 18:06:38 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-14/lens?id=16992208ec0549fdbc776da35c9f799126d15d89&amp;follow=1'>Add photos from September 14</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 10:13:27 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-12/lens?id=de6decda3177ae64859be30d68ba1e3c4c132ec1&amp;follow=1'>Add photos from September 12</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:50:19 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-07/lens?id=49a105101493f4dd51259dd62dcbd24df0909bd3&amp;follow=1'>Add photos from September 7</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:48:24 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=55728948b94a17b99fabeb1c61d20c5ef18c7f73&amp;follow=1'>Allow not having descriptions</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-23 17:44:15 -0400'>2024-09-23</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=9a38d0932d64b4a2ed5a6a2499490094d3bf8e7e&amp;follow=1'>Automatically select the last used lens for a body</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-19 23:20:42 -0400'>2024-09-19</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-05/lens?id=894873c86c5397a92499de39b4c52b5e99801441&amp;follow=1'>Add photos from September 5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-15 16:02:27 -0400'>2024-09-15</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=32b69f7df4c155d7a09f140a53c3b39a330027e4&amp;follow=1'>Add some more film stocks to the list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 20:06:35 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-02/lens?id=45e859f37e503f2c85a3085a628226831e394b7b&amp;follow=1'>Add photos from September 2</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 12:54:24 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=57e90a2d8f5f9b6385ffeb0e0e7b3237cb395b80&amp;follow=1'>Add Fomapan 200 to films list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-10 20:30:28 -0400'>2024-09-10</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-08-29/lens?id=1134af7da7776a0631995094a9225ce3541a9518&amp;follow=1'>Add August 29 picnic photos</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:44:08 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=775260288133dc90bb600785772ac931854aa618&amp;follow=1'>Apply some bold to trips rendering</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:38:22 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=dd7fda85bcc69cd4cd35e006cffabf3bdf765104&amp;follow=1'>Render trips hopefully more efficiently</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:26:18 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=02cac2ffadee1d3f66426bb48a64aea78907878c&amp;follow=1'>Allow removing bodies and lenses</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 10:59:25 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=2c25b7204ecab1be0d128d984eabe35b10a3a418&amp;follow=1'>Limit body width so it looks less silly on desktop</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 21:02:03 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=74df90da35ed7886c4067fae700c9db1d3b2ef0a&amp;follow=1'>Handle no film being loaded</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 20:58:45 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=a7f8aa5246afbf9c01ca295bdd2af0e11faeb7d3&amp;follow=1'>Fancy up the text a little</a></td><td>June McEnroe