about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-02-22 23:56:55 -0500
committerJune McEnroe <june@causal.agency>2019-02-22 23:56:55 -0500
commitc168e54f0687d7c0c87dbbdd1f735400b35eb6da (patch)
treea66f88fd920975b9e56e3b68638a8032887a1717
parentDisable terminal flow control (diff)
downloadcatgirl-c168e54f0687d7c0c87dbbdd1f735400b35eb6da.tar.gz
catgirl-c168e54f0687d7c0c87dbbdd1f735400b35eb6da.zip
Move IRC formatting reset to C-s
Opens C-n for window switching.
-rw-r--r--catgirl.18
-rw-r--r--ui.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/catgirl.1 b/catgirl.1
index 3a6b2f5..f28900b 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd February 21, 2019
+.Dd February 22, 2019
 .Dt CATGIRL 1
 .Os
 .
@@ -246,14 +246,12 @@ commands, nicks and channels.
 .
 .Ss IRC Formatting
 .Bl -tag -width Ds -compact
-.It Ic C-n
-Reset formatting.
 .It Ic C-o
 Toggle bold.
-This may need to be typed as
-.Ic C-v C-o .
 .It Ic C-r
 Set or reset color.
+.It Ic C-s
+Reset formatting.
 .It Ic C-t
 Toggle italics.
 .It Ic C-u
diff --git a/ui.c b/ui.c
index 4db7e02..847e37c 100644
--- a/ui.c
+++ b/ui.c
@@ -493,9 +493,9 @@ static void keyChar(wchar_t ch) {
 		break; case CTRL(L'W'): edit(win->tag, EditKillBackWord, 0);
 
 		break; case CTRL(L'C'): edit(win->tag, EditInsert, IRCColor);
-		break; case CTRL(L'N'): edit(win->tag, EditInsert, IRCReset);
 		break; case CTRL(L'O'): edit(win->tag, EditInsert, IRCBold);
 		break; case CTRL(L'R'): edit(win->tag, EditInsert, IRCColor);
+		break; case CTRL(L'S'): edit(win->tag, EditInsert, IRCReset);
 		break; case CTRL(L'T'): edit(win->tag, EditInsert, IRCItalic);
 		break; case CTRL(L'U'): edit(win->tag, EditInsert, IRCUnderline);
 		break; case CTRL(L'V'): edit(win->tag, EditInsert, IRCReverse);
erent delimiters for snapshot formats, while the documentation has always been clear about spaces being the only valid delimiter: The value is a space-separated list of zero or more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip". Supporting the undocumented delimiters makes the code unnecessarily complex. Remove them. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Replace most uses of strncmp() with prefixcmp()Lukas Fleischer This is a preparation for replacing all prefix checks with either strip_prefix() or starts_with() when Git 1.8.6 is released. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-09README: Fix dependenciesLukas Fleischer * Remove the dependency on Git (which can be obtained automatically when building, using either the Git submodule or `make get-git`). * Use proper upstream names of dependencies. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08README: Spelling and formatting fixesLukas Fleischer * Several small spelling and capitalization fixes. * Use consistent and better-looking formatting that is compatible with AsciiDoc (and partly compatible with RST). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08Fix UTF-8 with syntax-highlighting.pyPřemysl Janouch Previously the script tried to encode output from Pygments with the ASCII codec, which failed. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Add a suggestion to the manpagePřemysl Janouch So that people wishing to use "enable-http-clone" don't have to find out the correct settings on their own. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix the example configurationPřemysl Janouch "enable-git-clone" doesn't exist, replaced with "enable-http-clone". Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix about-formatting.shPřemysl Janouch dash failed to parse the script. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix some spelling errorsPřemysl Janouch Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08filters: highlight.sh: add css comments for highlight 2.6 and 3.8Ferry Huberts