about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-03-23 15:03:55 -0400
committerJune McEnroe <june@causal.agency>2020-03-23 15:03:55 -0400
commitef6518a6271b2e645a770e4bcce6eaaaaa08bf5d (patch)
treeff4a155a2131713246fd240863f76cad05b09686
parentHandle bracketed paste, including newlines (diff)
downloadcatgirl-ef6518a6271b2e645a770e4bcce6eaaaaa08bf5d.tar.gz
catgirl-ef6518a6271b2e645a770e4bcce6eaaaaa08bf5d.zip
Add M-Enter to insert a newline
Diffstat (limited to '')
-rw-r--r--catgirl.14
-rw-r--r--ui.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/catgirl.1 b/catgirl.1
index ad820ac..c3547be 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd March 22, 2020
+.Dd March 23, 2020
 .Dt CATGIRL 1
 .Os
 .
@@ -382,6 +382,8 @@ Delete to beginning of line.
 Delete previous word.
 .It Ic C-y
 Paste previously deleted text.
+.It Ic M-Enter
+Insert a newline without sending a command.
 .It Ic M-b
 Move to previous word.
 .It Ic M-d
diff --git a/ui.c b/ui.c
index 0500118..31fe276 100644
--- a/ui.c
+++ b/ui.c
@@ -205,6 +205,7 @@ static short colorPair(short fg, short bg) {
 	X(KeyMetaM, "\33m", NULL) \
 	X(KeyMetaU, "\33u", NULL) \
 	X(KeyMetaV, "\33v", NULL) \
+	X(KeyMetaEnter, "\33\r", "\33\n") \
 	X(KeyMetaSlash, "\33/", NULL) \
 	X(KeyFocusIn, "\33[I", NULL) \
 	X(KeyFocusOut, "\33[O", NULL) \
@@ -861,6 +862,7 @@ static void keyCode(int code) {
 		break; case KeyFocusIn:  unmark(window);
 		break; case KeyFocusOut: mark(window);
 
+		break; case KeyMetaEnter: edit(id, EditInsert, L'\n');
 		break; case KeyMetaSlash: windowShow(windows.swap);
 
 		break; case KeyMetaA: showAuto();
id=5be0d7f6ec83dd09837f5da2617178136954c90d&follow=1'>Use mtags in source-filterJune McEnroe 2021-01-19Add mtags to generate tags for make and mdocJune McEnroe 2021-01-19Map tags to IDs using only [[:alnum:]-._]June McEnroe 2021-01-19Don't use a pager if reading standard inputJune McEnroe 2021-01-19Support BSD make syntax and match *.amJune McEnroe These don't really go together, but... 2021-01-19Match tab following escaped newline in make assignmentsJune McEnroe Otherwise it ends up going into Shell state. 2021-01-18Allow matching lexers using first input lineJune McEnroe