ncurses 6.1 - patch 20190720

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index e0dab0706e98b09862d6e62d1f0cab4cd411bb44..32ea4541ebe973d0fd720dabdca8a0375df0f47a 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -48,7 +48,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
 #include <parametrized.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.275 2019/05/04 14:41:06 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.277 2019/06/29 23:23:22 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -1939,7 +1939,7 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
 #if NCURSES_XNAMES
     if (extended) {
        int check = is_user_capability(name);
 #if NCURSES_XNAMES
     if (extended) {
        int check = is_user_capability(name);

-       if (check != actual) {
+       if (check != actual && (check >= 0 && actual >= 0)) {

            _nc_warning("extended %s capability has %d parameters, expected %d",
                        name, actual, check);
        } else if (debug_level > 1) {
            _nc_warning("extended %s capability has %d parameters, expected %d",
                        name, actual, check);
        } else if (debug_level > 1) {


@@ -2930,6 +2930,11 @@ check_termtype(TERMTYPE2 *tp, bool literal)
     check_printer(tp);
     check_screen(tp);
 
     check_printer(tp);
     check_screen(tp);
 

+    /*
+     * These are probably both or none.
+     */
+    PAIRED(parm_index, parm_rindex);
+

     /*
      * These may be mismatched because the terminal description relies on
      * restoring the cursor visibility by resetting it.
     /*
      * These may be mismatched because the terminal description relies on
      * restoring the cursor visibility by resetting it.