From 1d2d88c2b90646610d189dd76eee25176797edf4 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 22 Aug 2002 06:56:35 +0000
Subject: [PATCH] * keys.h: Remove, include ... * myslang.h: ... here. *
 Makefile.am: Remove keys.h.

---
 src/ChangeLog   |  4 ++++
 src/Makefile.am |  2 +-
 src/keys.h      | 20 --------------------
 src/myslang.h   |  9 ++++++++-
 4 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 src/keys.h

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a3d8e4cf..4a7f4b884 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-22  Pavel Roskin  <proski@gnu.org>
 
+	* keys.h: Remove, include ...
+	* myslang.h: ... here.
+	* Makefile.am: Remove keys.h.
+
 	* dlg.h: Remove unused fields in struct Dlg_head.
 	* dlg.c: Adjust for the above.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 020f4220a..cde8c5bb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,7 @@ SRCS =	achown.c achown.h background.c background.h boxes.c boxes.h	\
 	eregex.h ext.c ext.h file.c filegui.c filegui.h file.h		\
 	filenot.c fileopctx.c fileopctx.h find.c find.h findme.c	\
 	findme.h fs.h fsusage.c fsusage.h global.h help.c help.h	\
-	hotlist.c hotlist.h i18n.h info.c info.h key.c key.h keys.h	\
+	hotlist.c hotlist.h i18n.h info.c info.h key.c key.h		\
 	keyxdef.c layout.c layout.h learn.c learn.h listmode.c		\
 	listmode.h main.c main.h menu.c menu.h				\
 	mountlist.c mountlist.h mouse.c mouse.h myslang.h option.c	\
diff --git a/src/keys.h b/src/keys.h
deleted file mode 100644
index b751f6c1b..000000000
--- a/src/keys.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __KEYS_H
-#define __KEYS_H
-
-/* Key constants as used by mc for non-curses ports */
-
-enum {
-    KEY_BACKSPACE = 400,
-    KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
-    KEY_HOME, KEY_A1, KEY_C1, KEY_NPAGE, KEY_PPAGE, KEY_IC,
-    KEY_ENTER, KEY_DC, KEY_SCANCEL, KEY_BTAB
-};
-
-#define KEY_KP_ADD	4001
-#define KEY_KP_SUBTRACT	4002
-#define KEY_KP_MULTIPLY	4003
-
-
-#define KEY_F(x) 1000+x
-
-#endif /* __KEYS_H */
diff --git a/src/myslang.h b/src/myslang.h
index 0a8afa5c5..a7af00e30 100644
--- a/src/myslang.h
+++ b/src/myslang.h
@@ -11,7 +11,14 @@
 #    include "slang/slang-mc.h"
 #endif /* !HAVE_SYSTEM_SLANG */
 
-#include "keys.h"
+enum {
+    KEY_BACKSPACE = 400,
+    KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
+    KEY_HOME, KEY_A1, KEY_C1, KEY_NPAGE, KEY_PPAGE, KEY_IC,
+    KEY_ENTER, KEY_DC, KEY_SCANCEL, KEY_BTAB
+};
+
+#define KEY_F(x) 1000+x
 
 #define ACS_VLINE SLSMG_VLINE_CHAR
 #define ACS_HLINE SLSMG_HLINE_CHAR