ncurses 5.6 - patch 20070317

[ncurses.git] / test / cardfile.c

diff --git a/test/cardfile.c b/test/cardfile.c
index 318342f0783b4bfbdafe7e5202497e690695a1b5..2985b2ed8f261718bc9fb83a29c8c4e35b913d52 100644 (file)
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2006,2007 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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: cardfile.c,v 1.27 2004/11/06 19:33:39 tom Exp $
+ * $Id: cardfile.c,v 1.29 2007/03/10 19:16:45 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -306,8 +306,8 @@ form_virtualize(WINDOW *w)
        return (MY_CTRL_N);
     case CTRL('P'):
        return (MY_CTRL_P);
-    case CTRL('Q'):
-    case 033:
+    case QUIT:
+    case ESCAPE:
        return (MY_CTRL_Q);
 
     case KEY_BACKSPACE:
@@ -389,7 +389,6 @@ cardfile(char *fname)
     int y;
     int x;
     int ch = ERR;
-    int last_ch;
     int finished = FALSE;
 
     show_legend();
@@ -433,7 +432,6 @@ cardfile(char *fname)
        update_panels();
        doupdate();
 
-       last_ch = ch;
        ch = form_virtualize(panel_window(top_card->panel));
        switch (form_driver(top_card->form, ch)) {
        case E_OK: