* copying.c: Rebuild.

	* copying.awk: Don't use immediate_quit.  Use 'no_set_class', not
	'no_class'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3830a7e4589efbb71373c1c8eacda0c667ae2d31..64d83b698354eec4d9e406df3dda0cfcfb04c66d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-26  Tom Tromey  <tromey@redhat.com>
+
+       * copying.c: Rebuild.
+       * copying.awk: Don't use immediate_quit.  Use 'no_set_class', not
+       'no_class'.
+
 2012-07-26  Tom Tromey  <tromey@redhat.com>
 
        * symmisc.c (print_symbol_bcache_statistics): Use QUIT, not

diff --git a/gdb/copying.awk b/gdb/copying.awk
index 936f435c98e1edea3ede0123ac86d01e4d854ce2..00c63cd3a4ee7afd149d93b93bb9039549040fbb 100644 (file)
--- a/gdb/copying.awk
+++ b/gdb/copying.awk
@@ -13,11 +13,9 @@ BEGIN        {
          print ""
          print "void _initialize_copying (void);"
          print ""
-         print "extern int immediate_quit;";
          print "static void";
          print "show_copying_command (char *ignore, int from_tty)";
          print "{";
-         print "  immediate_quit++;";
        }
 NR == 1,/^[    ]*15\. Disclaimer of Warranty\.[        ]*$/    {
          if ($0 ~ /\f/)
@@ -33,13 +31,11 @@ NR == 1,/^[         ]*15\. Disclaimer of Warranty\.[        ]*$/    {
            }
        }
 /^[     ]*15\. Disclaimer of Warranty\.[       ]*$/    {
-         print "  immediate_quit--;";
          print "}";
          print "";
          print "static void";
          print "show_warranty_command (char *ignore, int from_tty)";
          print "{";
-         print "  immediate_quit++;";
        }
 /^[    ]*15\. Disclaimer of Warranty\.[        ]*$/, /^[       ]*END OF TERMS AND CONDITIONS[  ]*$/{  
          if (! ($0 ~ /^[       ]*END OF TERMS AND CONDITIONS[  ]*$/)) 
@@ -51,16 +47,15 @@ NR == 1,/^[         ]*15\. Disclaimer of Warranty\.[        ]*$/    {
            }
        }
 END    {
-         print "  immediate_quit--;";
          print "}";
          print "";
          print "void"
          print "_initialize_copying (void)";
          print "{";
-         print "  add_cmd (\"copying\", no_class, show_copying_command,";
+         print "  add_cmd (\"copying\", no_set_class, show_copying_command,";
          print "          _(\"Conditions for redistributing copies of GDB.\"),";
          print "          &showlist);";
-         print "  add_cmd (\"warranty\", no_class, show_warranty_command,";
+         print "  add_cmd (\"warranty\", no_set_class, show_warranty_command,";
          print "          _(\"Various kinds of warranty you do not have.\"),";
          print "          &showlist);";
          print "";

diff --git a/gdb/copying.c b/gdb/copying.c
index 9aac2e690a30ca1f56317e9d8f1c3feec9993fde..c71c4e5f2b667c2da745d81996983d5a326fcf02 100644 (file)
--- a/gdb/copying.c
+++ b/gdb/copying.c
@@ -17,7 +17,7 @@ show_copying_command (char *ignore, int from_tty)
   printf_filtered ("                    GNU GENERAL PUBLIC LICENSE\n");
   printf_filtered ("                       Version 3, 29 June 2007\n");
   printf_filtered ("\n");
-  printf_filtered (" Copyright (C) 2007, 2012 Free Software Foundation, Inc. <http://fsf.org/>\n");
+  printf_filtered (" Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\n");
   printf_filtered (" Everyone is permitted to copy and distribute verbatim copies\n");
   printf_filtered (" of this license document, but changing it is not allowed.\n");
   printf_filtered ("\n");