aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2014-09-11 11:01:36 +0200
committerMarc André Tanner <mat@brain-dump.org>2014-09-11 11:01:36 +0200
commit89c99d64005f9e31b70f7eae8c0f6a76b24f4b14 (patch)
tree89546268bc61a2d3df9166159259efea6f8e1b5b
parent7c3711eac82949df4b81e1a33fbc569080dc83e4 (diff)
downloadvis-89c99d64005f9e31b70f7eae8c0f6a76b24f4b14.tar.gz
vis-89c99d64005f9e31b70f7eae8c0f6a76b24f4b14.tar.xz
Remove Ctrl+c for quit, since we now have a command prompt
-rw-r--r--config.def.h4
-rw-r--r--vis.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/config.def.h b/config.def.h
index b332e18..d26045d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -90,9 +90,7 @@ static KeyBinding basic_movement[] = {
{ { KEY(NPAGE) }, cursor, { .m = window_page_down } },
{ { KEY(HOME) }, movement, { .i = MOVE_LINE_START } },
{ { KEY(END) }, movement, { .i = MOVE_LINE_FINISH } },
- // temporary until we have a way to enter user commands
- { { CONTROL('c') }, quit, },
- { /* empty last element, array terminator */ },
+ { /* empty last element, array terminator */ },
};
static KeyBinding vis_movements[] = {
diff --git a/vis.c b/vis.c
index da8d37c..29ffe9e 100644
--- a/vis.c
+++ b/vis.c
@@ -375,6 +375,7 @@ static void insert_verbatim(const Arg *arg);
static void cursor(const Arg *arg);
/* call editor function as indicated by arg->f */
static void call(const Arg *arg);
+/* quit editor, discard all changes */
static void quit(const Arg *arg);
/** commands to enter at the ':'-prompt */
@@ -878,7 +879,7 @@ static bool cmd_quit(const char *argv[]) {
return false;
editor_window_close(vis->win);
if (!vis->windows)
- running = false;
+ quit(NULL);
return true;
}
@@ -890,7 +891,7 @@ static bool cmd_qall(const char *argv[]) {
editor_window_close(win);
}
if (!vis->windows)
- running = false;
+ quit(NULL);
return vis->windows == NULL;
}