ncurses 5.6 - patch 20070721

[ncurses.git] / ncurses / base / MKkeyname.awk

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index b27eb75ab8b6ddbf0f954b375cde2ba62b3bfb7b..1c2a0760b747cbb16ffc365b4135dfea28529c9d 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,4 +1,4 @@
-# $Id: MKkeyname.awk,v 1.32 2007/04/21 23:01:49 tom Exp $
+# $Id: MKkeyname.awk,v 1.36 2007/06/12 20:28:18 tom Exp $
 ##############################################################################
 # Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -74,7 +74,7 @@ END {
        print "                         if (MyTable[c] == 0) {"
        print "                                 int cc = c;"
        print "                                 p = name;"
-       print "                                 if (cc >= 128) {"
+       print "                                 if (cc >= 128 && (SP == 0 || SP->_use_meta)) {"
        print "                                         strcpy(p, \"M-\");"
        print "                                         p += 2;"
        print "                                         cc -= 128;"
@@ -115,15 +115,6 @@ END {
        print " return result;"
        print "}"
        print ""
-       print "#if USE_WIDEC_SUPPORT"
-       print "NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)"
-       print "{"
-       print " NCURSES_CONST char *result = keyname((int)c);"
-       print " if (!strncmp(result, \"M-\", 2)) result = 0;"
-       print " return result;"
-       print "}"
-       print "#endif"
-       print ""
        print "#if NO_LEAKS"
        print "void _nc_keyname_leaks(void)"
        print "{"