From d3ff7372dadbc9d34f6811cfa597e2632ecdbf1c Mon Sep 17 00:00:00 2001
From: NeilBrown <neil@brown.name>
Date: Sun, 13 Dec 2015 15:25:58 +1100
Subject: [PATCH] Move 'exit' functionality out of 'display-ncurses'.

Put it in 'mode-emacs' for now.

Signed-off-by: NeilBrown <neil@brown.name>
---
 display-ncurses.c | 12 +++++-------
 mode-emacs.c      | 13 +++++++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/display-ncurses.c b/display-ncurses.c
index 56fa3ad1..52290889 100644
--- a/display-ncurses.c
+++ b/display-ncurses.c
@@ -66,15 +66,13 @@ DEF_CMD(nc_misc)
 {
 	struct pane *p = ci->home;
 
-	if (strcmp(ci->str, "exit") == 0)
-		call3("event:deactivate", p, 0, NULL);
-	else if (strcmp(ci->str, "refresh") == 0) {
+	if (strcmp(ci->str, "refresh") == 0) {
 		clear();
 		pane_damaged(p,  DAMAGED_SIZE);
 		pane_refresh(p);
-	} else
-		return 0;
-	return 1;
+		return 1;
+	}
+	return 0;
 }
 
 static void ncurses_end(void)
@@ -123,7 +121,7 @@ DEF_CMD(ncurses_handle)
 	struct pane *p = ci->home;
 	struct display_data *dd = p->data;
 
-	if (strcmp(ci->key, "Misc") == 0)
+	if (strcmp(ci->key, "Display") == 0)
 		return nc_misc.func(ci);
 
 	if (strcmp(ci->key, "Close") == 0) {
diff --git a/mode-emacs.c b/mode-emacs.c
index da08c9d7..1c1bd341 100644
--- a/mode-emacs.c
+++ b/mode-emacs.c
@@ -168,8 +168,7 @@ static struct str_command {
 	{CMD(emacs_str), "WindowOP", "split-y", "emCX-Chr-2"},
 	{CMD(emacs_str), "WindowOP", "split-x", "emCX-Chr-3"},
 	{CMD(emacs_str), "WindowOP", "close", "emCX-Chr-0"},
-	{CMD(emacs_str), "Misc", "exit", "emCX-C-Chr-C"},
-	{CMD(emacs_str), "Misc", "refresh", "C-Chr-L"},
+	{CMD(emacs_str), "Display", "refresh", "C-Chr-L"},
 	{CMD(emacs_str), "Abort", NULL, "C-Chr-G"},
 	{CMD(emacs_str), "NOP", NULL, "M-Chr-G"},
 	{CMD(emacs_str), "NOP", NULL, "emCX-C-Chr-G"},
@@ -191,6 +190,14 @@ REDEF_CMD(emacs_str)
 	return key_handle(&ci2);
 }
 
+DEF_CMD(emacs_exit)
+{
+	struct pane *p = ci->home;
+
+	call3("event:deactivate", p, 0, NULL);
+	return 1;
+}
+
 DEF_CMD(emacs_insert)
 {
 	int ret;
@@ -636,6 +643,8 @@ static void emacs_init(void)
 	key_add(m, "C-Chr-S", &emacs_search);
 	key_add(m, "Search String", &emacs_search);
 
+	key_add(m, "emCX-C-Chr-C", &emacs_exit);
+
 	key_add_range(m, "M-Chr-0", "M-Chr-9", &emacs_num);
 	emacs_map = m;
 }
-- 
2.39.5