ncurses 5.7 - patch 20090418
[ncurses.git] / ncurses / tinfo / init_keytry.c
index 2f6fe4f6fad791972a16f5f79669b6162b3ad085..9fbb5d1ed84fb90e3c19cc43ab5ce77a8cbf3dfb 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2006,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2008,2009 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  ****************************************************************************/
 
 #include <curses.priv.h>
-
-#include <term.h>
-/* keypad_xmit, keypad_local, meta_on, meta_off */
-/* cursor_visible,cursor_normal,cursor_invisible */
-
 #include <tic.h>               /* struct tinfo_fkeys */
 
 #include <term_entry.h>
 
-MODULE_ID("$Id: init_keytry.c,v 1.12 2008/05/24 21:44:51 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.13 2009/04/18 18:53:37 tom Exp $")
 
 /*
 **      _nc_init_keytry()
@@ -102,7 +97,8 @@ _nc_init_keytry(SCREEN *sp)
                if (name != 0
                    && *name == 'k'
                    && value != 0
-                   && key_defined(value) == 0) {
+                   && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx
+                                                    value) == 0) {
                    (void) _nc_add_to_try(&(sp->_keytry),
                                          value,
                                          n - STRCOUNT + KEY_MAX);