From: Tom Tromey <tromey@redhat.com>
Date: Thu, 26 Jul 2012 17:21:06 +0000 (+0000)
Subject: 	* copying.c: Rebuild.
X-Git-Tag: binutils-2_23-branchpoint~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ba19b4c7a5c258c0fdde17e8a89b7032644eb4b;p=external%2Fbinutils.git

	* 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 3830a7e..64d83b6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 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
 	immediate_quit.
 	(print_objfile_statistics): Likewise.
diff --git a/gdb/copying.awk b/gdb/copying.awk
index 936f435..00c63cd 100644
--- 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 ~ //)
@@ -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 9aac2e6..c71c4e5 100644
--- 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");