2005-02-21 Andrew Cagney <cagney@gnu.org>

	* command.h (deprecated_add_set_cmd): Rename add_set_cmd.
	* cli/cli-decode.h (add_set_cmd): Delete declaration.
	* cli/cli-decode.c (deprecated_add_set_cmd): Rename add_set_cmd.
	* i386-nat.c (_initialize_i386_nat): Update call.
	* valprint.c (_initialize_valprint): Update comment.
	* gnu-nat.c (_initialize_gnu_nat): Update call.

7 files changed, 35 insertions, 25 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 19b14cd..1fe88db 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-21  Andrew Cagney  <cagney@gnu.org>
+
+	* command.h (deprecated_add_set_cmd): Rename add_set_cmd.
+	* cli/cli-decode.h (add_set_cmd): Delete declaration.
+	* cli/cli-decode.c (deprecated_add_set_cmd): Rename add_set_cmd.
+	* i386-nat.c (_initialize_i386_nat): Update call.
+	* valprint.c (_initialize_valprint): Update comment.
+	* gnu-nat.c (_initialize_gnu_nat): Update call.
+
 2005-02-21  Alan Modra  <amodra@bigpond.net.au>
 
 	* elfread.c (elf_symtab_read): Discard section syms.
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 33a045a..30ce415 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -368,12 +368,12 @@ add_setshow_cmd_full (char *name,
 }
 
 struct cmd_list_element *
-add_set_cmd (char *name,
-	     enum command_class class,
-	     var_types var_type,
-	     void *var,
-	     char *doc,
-	     struct cmd_list_element **list)
+deprecated_add_set_cmd (char *name,
+			enum command_class class,
+			var_types var_type,
+			void *var,
+			char *doc,
+			struct cmd_list_element **list)
 {
   return add_set_or_show_cmd (name, set_cmd, class, var_type, var, doc, list);
 }
diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 261f8c7..f3a7546 100644
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -286,12 +286,6 @@ extern void delete_cmd (char *, struct cmd_list_element **);
 extern void help_cmd_list (struct cmd_list_element *, enum command_class,
 			   char *, int, struct ui_file *);
 
-extern struct cmd_list_element *add_set_cmd (char *name, enum
-					     command_class class,
-					     var_types var_type, void *var,
-					     char *doc,
-					     struct cmd_list_element **list);
-
 /* Functions that implement commands about CLI commands. */
 
 extern void help_cmd (char *, struct ui_file *);
diff --git a/gdb/command.h b/gdb/command.h
index 7e19f43..0729752 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -205,11 +205,15 @@ extern void help_list (struct cmd_list_element *, char *,
 extern void help_cmd_list (struct cmd_list_element *, enum command_class,
 			   char *, int, struct ui_file *);
 
-extern struct cmd_list_element *add_set_cmd (char *name, enum
-					     command_class class,
-					     var_types var_type, void *var,
-					     char *doc,
-					     struct cmd_list_element **list);
+/* NOTE: cagney/2005-02-21: Since every set command should be paired
+   with a corresponding show command (i.e., add_setshow_*) this call
+   should not be needed.  Unfortunatly some are not (e.g.,
+   "maintenance <variable> <value>") and those need to be fixed.  */
+extern struct cmd_list_element *deprecated_add_set_cmd (char *name, enum
+							command_class class,
+							var_types var_type, void *var,
+							char *doc,
+							struct cmd_list_element **list);
 
 /* Method for show a set/show variable's VALUE on FILE.  If this
    method isn't supplied deprecated_show_value_hack() is called (which
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index a20fd70..4304553 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -3371,9 +3371,10 @@ _initialize_gnu_nat (void)
 
   add_task_commands ();
   add_thread_commands ();
-  add_set_cmd ("gnu-debug", class_maintenance,
-	       var_boolean, (char *) &gnu_debug_flag,
-	       "Set debugging output for the gnu backend.", &maintenancelist);
+  deprecated_add_set_cmd ("gnu-debug", class_maintenance,
+			  var_boolean, (char *) &gnu_debug_flag,
+			  "Set debugging output for the gnu backend.",
+			  &maintenancelist);
 }
 
 #ifdef	FLUSH_INFERIOR_CACHE
diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
index 5388ef9..518da88 100644
--- a/gdb/i386-nat.c
+++ b/gdb/i386-nat.c
@@ -670,13 +670,13 @@ _initialize_i386_nat (void)
 #ifdef I386_USE_GENERIC_WATCHPOINTS
   /* A maintenance command to enable printing the internal DRi mirror
      variables.  */
-  add_set_cmd ("show-debug-regs", class_maintenance,
-	       var_boolean, (char *) &maint_show_dr,
-	       "\
+  deprecated_add_set_cmd ("show-debug-regs", class_maintenance,
+			  var_boolean, (char *) &maint_show_dr, _("\
 Set whether to show variables that mirror the x86 debug registers.\n\
 Use \"on\" to enable, \"off\" to disable.\n\
 If enabled, the debug registers values are shown when GDB inserts\n\
 or removes a hardware breakpoint or watchpoint, and when the inferior\n\
-triggers a breakpoint or watchpoint.", &maintenancelist);
+triggers a breakpoint or watchpoint."),
+			  &maintenancelist);
 #endif
 }
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 7c6806f..00604b9 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -1274,8 +1274,10 @@ Show default output radix for printing of values."), NULL,
   /* The "set radix" and "show radix" commands are special in that
      they are like normal set and show commands but allow two normally
      independent variables to be either set or shown with a single
-     command.  So the usual deprecated_add_set_cmd() and
+     command.  So the usual deprecated_add_set_cmd() and [deleted]
      add_show_from_set() commands aren't really appropriate. */
+  /* FIXME: i18n: With the new add_setshow_integer command, that is no
+     longer true - show can display anything.  */
   add_cmd ("radix", class_support, set_radix, _("\
 Set default input and output number radices.\n\
 Use 'set input-radix' or 'set output-radix' to independently set each.\n\