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
commit53c4f7f187b0599ae67cc898ee60963cff790884 (patch)
treea54df42f4271666252528e238dfff461643a4746
parentAdd \? exit status prompt expansion (diff)
downloadsrc-53c4f7f187b0599ae67cc898ee60963cff790884.tar.gz
src-53c4f7f187b0599ae67cc898ee60963cff790884.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;
e McEnroe 2022-02-23Add missing unistd.h include in input.cJune McEnroe 2022-02-22Document the interfaceJune McEnroe 2022-02-20Clean up unimplemented editing mode stuffJune McEnroe 2022-02-20Save input buffer contentsJune McEnroe 2022-02-20Share a cut buffer between all edit buffersJune McEnroe 2022-02-20Assert return values in edit testsJune McEnroe 2022-02-20Move mbs out of struct Edit, use a global bufferJune McEnroe 2022-02-20Clear edit buffer before running commandJune McEnroe 2022-02-20Show indicator in status when window has pending inputJune McEnroe 2022-02-20Use separate edit buffers for each IDJune McEnroe 2022-02-20Make sure new cap is actually larger than new lengthJune McEnroe 2022-02-20Remove unused mbs.len field from struct EditJune McEnroe 2022-02-19Remove unneeded includes in ui.cJune McEnroe 2022-02-19Reimplement tab completeJune McEnroe 2022-02-19Handle errors from editFn, etc.June McEnroe 2022-02-19Reimplement text macrosJune McEnroe 2022-02-19Factor out input handling to input.cJune McEnroe 2022-02-19Factor out window management to window.cJune McEnroe 2022-02-19Enable -Wmissing-prototypesJune McEnroe 2022-02-19Fix edit.[ch] license notice additional permissionsJune McEnroe 2022-02-19Run line editing testsJune McEnroe 2022-02-18Implement new line editing "library"June McEnroe 2022-02-18Simplify cursor positioning in inputJune McEnroe 2022-02-18Fix M-f orderingJune McEnroe 2022-02-12Move sandman build to scripts/MakefileJune McEnroe 2022-02-12Use compat_readpassphrase.c on LinuxJune McEnroe 2022-02-12Copy RPP defines from oconfigureJune McEnroe