summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-03-09 19:27:15 -0400
committerJune McEnroe <june@causal.agency>2020-03-09 20:01:30 -0400
commit0972708098ae35efd0b0ef632ed6d68301957e6b (patch)
tree96128928820b5df108474bc833499fc4f7e4730a
parentAdd \? exit status prompt expansion (diff)
downloadsrc-0972708098ae35efd0b0ef632ed6d68301957e6b.tar.gz
src-0972708098ae35efd0b0ef632ed6d68301957e6b.zip
Source .editrc before applying -v or -e
Otherwise a bind -v in .editrc will take precedence and overwrite the ^I
binding for sh-complete.
-rw-r--r--bin/1sh/histedit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c
index bb2b14d1..520b4554 100644
--- a/bin/1sh/histedit.c
+++ b/bin/1sh/histedit.c
@@ -138,12 +138,12 @@ bad:
 			INTON;
 		}
 		if (el) {
+			el_source(el, NULL);
 			if (Vflag)
 				el_set(el, EL_EDITOR, "vi");
 			else if (Eflag)
 				el_set(el, EL_EDITOR, "emacs");
 			el_set(el, EL_BIND, "^I", "sh-complete", NULL);
-			el_source(el, NULL);
 		}
 	} else {
 		INTOFF;
Based on seprint(2) from Plan 9. I'm not sure if my return value exactly matches Plan 9's in the case of truncation. seprint(2) is described only as returning a pointer to the terminating '\0', but if it does so even in the case of truncation, it is awkward for the caller to detect. This implementation returns end in the truncation case, so that (ptr == end) indicates truncation. 2021-05-27Add pounce-notify to README 2.4June McEnroe 2021-05-27Fix ENVIRONMENT formatting in pounce-notify(1)June McEnroe 2021-05-27Add note about Libera.Chat SASL-only rangesJune McEnroe 2021-05-25Add QUIRKS fileJune McEnroe 2021-05-19Replace freenode with tilde.chatJune McEnroe 2021-05-04notify: Reword pounce-notify manualJune McEnroe 2021-05-02Clean up Makefiles, configure scriptsJune McEnroe Default MANDIR to ${PREFIX}/man since it turns out man-db includes /usr/local/man by default. Add support for BINDIR. Separate libs out into LDADD variables. 2021-04-30palaver: Exit on getopt failureJune McEnroe Oops. 2021-04-30notify: Implement pounce-notifyJune McEnroe