2003-10-16  Adam Fedor  <fedor@gnu.org>

	* gdb/linespec.c (decode_line_1): Search for ObjC selectors
	only if allow_objc_selectors_flag.
	* gdb/breakpoint.c (breakpoint_re_set_one): Don't allow search
	for ObjC selectors when resetting a breakpoint.

Index: gdb/breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.132
diff -u -p -r1.132 breakpoint.c
--- gdb/breakpoint.c	13 Oct 2003 23:53:20 -0000	1.132
+++ gdb/breakpoint.c	17 Oct 2003 03:41:32 -0000
@@ -52,6 +52,8 @@
 
 #include "gdb-events.h"
 
+extern int allow_objc_selectors_flag;
+
 /* Prototypes for local functions. */
 
 static void until_break_command_continuation (struct continuation_arg *arg);
@@ -6854,7 +6856,9 @@ breakpoint_re_set_one (void *bint)
       set_language (b->language);
       input_radix = b->input_radix;
       s = b->addr_string;
+      allow_objc_selectors_flag = 0;
       sals = decode_line_1 (&s, 1, (struct symtab *) NULL, 0, (char ***) NULL);
+      allow_objc_selectors_flag = 1;
       for (i = 0; i < sals.nelts; i++)
 	{
 	  resolve_sal_pc (&sals.sals[i]);
Index: gdb/linespec.c
===================================================================
RCS file: /cvs/src/src/gdb/linespec.c,v
retrieving revision 1.51
diff -u -p -r1.51 linespec.c
--- gdb/linespec.c	2 Aug 2003 03:59:40 -0000	1.51
+++ gdb/linespec.c	17 Oct 2003 03:41:34 -0000
@@ -36,6 +36,8 @@
 #include "objc-lang.h"
 #include "linespec.h"
 
+int allow_objc_selectors_flag = 1;
+
 /* We share this one with symtab.c, but it is not exported widely. */
 
 extern char *operator_chars (char *, char **);
@@ -698,6 +700,7 @@ decode_line_1 (char **argptr, int funfir
 
   /* Check if the symbol could be an Objective-C selector.  */
 
+  if (allow_objc_selectors_flag)
   {
     struct symtabs_and_lines values;
     values = decode_objc (argptr, funfirstline, NULL,