ncurses 5.9 - patch 20140426

[ncurses.git] / ncurses / tinfo / lib_options.c

diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c
index 613c5d04fb3d787f28d117528e71e2f3835245c6..8e31d484bfff6691e820c30cf187be4d17b47b3c 100644 (file)
--- a/ncurses/tinfo/lib_options.c
+++ b/ncurses/tinfo/lib_options.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2011,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 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            *
@@ -46,7 +46,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_options.c,v 1.74 2013/01/12 16:44:17 tom Exp $")
+MODULE_ID("$Id: lib_options.c,v 1.77 2014/03/08 20:32:59 tom Exp $")
 
 NCURSES_EXPORT(int)
 idlok(WINDOW *win, bool flag)
@@ -56,7 +56,11 @@ idlok(WINDOW *win, bool flag)
 
     if (win) {
        SCREEN *sp = _nc_screen_of(win);
-       if (sp && IsTermInfo(sp)) {
+       if (sp != 0
+#ifdef USE_TERM_DRIVER
+           && IsTermInfo(sp)
+#endif
+           ) {
            sp->_nc_sp_idlok =
                win->_idlok = (flag && (NCURSES_SP_NAME(has_il) (NCURSES_SP_ARG)
                                        || change_scroll_region));
@@ -346,7 +350,7 @@ _nc_keypad(SCREEN *sp, int flag)
 #endif
        {
 #ifdef USE_TERM_DRIVER
-           rc = CallDriver_1(sp, kpad, flag);
+           rc = CallDriver_1(sp, td_kpad, flag);
            if (rc == OK)
                sp->_keypad_on = flag;
 #else