ncurses 6.0 - patch 20170318

[ncurses.git] / test / ncurses.c

diff --git a/test/ncurses.c b/test/ncurses.c
index 8f3ac071e339b70a17d67c5f32fc4e73fe38f54e..2130572735aff1f18d139ff006755c2eff659c4c 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.445 2016/09/10 23:30:15 tom Exp $
+$Id: ncurses.c,v 1.447 2017/03/11 23:20:12 Petr.Vanek Exp $
 
 ***************************************************************************/
 
@@ -1312,7 +1312,7 @@ attr_legend(WINDOW *helpwin)
              "Toggles:");
     if (use_colors) {
        MvWPrintw(helpwin, row++, col,
-                 "  f/F/b/F toggle foreground/background background color");
+                 "  f/F/b/B toggle foreground/background background color");
        MvWPrintw(helpwin, row++, col,
                  "  t/T     toggle text/background color attribute");
     }
@@ -2704,7 +2704,8 @@ init_all_colors(bool xterm_colors, char *palette_file)
        int n;
        int got;
        char result[BUFSIZ];
-       int check_n, check_r, check_g, check_b;
+       int check_n;
+       unsigned check_r, check_g, check_b;
 
        raw();
        noecho();
@@ -6925,11 +6926,11 @@ show_settings(void)
     show_string_setting("longname", longname());
     show_number_setting("baudrate", baudrate());
     if (erasechar() > 0) {
-       show_string_setting("unctrl(erasechar)", unctrl(erasechar()));
+       show_string_setting("unctrl(erasechar)", unctrl((chtype) erasechar()));
        show_string_setting("keyname(erasechar)", keyname(erasechar()));
     }
     if (killchar() > 0) {
-       show_string_setting("unctrl(killchar)", unctrl(killchar()));
+       show_string_setting("unctrl(killchar)", unctrl((chtype) killchar()));
        show_string_setting("keyname(killchar)", keyname(killchar()));
     }
 #if USE_WIDEC_SUPPORT