From 3b27aeeaa9c83198c5201af3055c720b87f86992 Mon Sep 17 00:00:00 2001
From: Elena Zannoni <ezannoni@kwikemart.cygnus.com>
Date: Fri, 14 Feb 2003 20:36:58 +0000
Subject: [PATCH] 2003-02-14  Elena Zannoni  <ezannoni@redhat.com>

        From Brian Ford  <ford@vss.fsi.com>

	* cli/cli-decode.c (lookup_cmd_composition) [TUI]: Properly
	conditionalize tui_active test.
	(lookup_cmd_1): Ditto.
---
 gdb/ChangeLog        | 8 ++++++++
 gdb/cli/cli-decode.c | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index df10628716..f90af6bc42 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-14  Elena Zannoni  <ezannoni@redhat.com>
+
+        From Brian Ford  <ford@vss.fsi.com>
+
+	* cli/cli-decode.c (lookup_cmd_composition) [TUI]: Properly
+	conditionalize tui_active test.
+	(lookup_cmd_1): Ditto.
+
 2003-02-14  Mark Kettenis  <kettenis@gnu.org>
 
 	* configure.in: Add check for _etext.
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index a9979f633b..2a6d196930 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -927,8 +927,10 @@ lookup_cmd_1 (char **text, struct cmd_list_element *clist,
      `tui_version'.  */
   for (p = *text;
        *p && (isalnum (*p) || *p == '-' || *p == '_' ||
+#if defined(TUI)
 	      (tui_active &&
 	       (*p == '+' || *p == '<' || *p == '>' || *p == '$')) ||
+#endif
 	      (xdb_commands && (*p == '!' || *p == '/' || *p == '?')));
        p++)
     ;
@@ -1299,8 +1301,10 @@ lookup_cmd_composition (char *text,
 	 `tui_version'.  */
       for (p = text;
          *p && (isalnum (*p) || *p == '-' || *p == '_' ||
+#if defined(TUI)
                 (tui_active &&
                  (*p == '+' || *p == '<' || *p == '>' || *p == '$')) ||
+#endif
                 (xdb_commands && (*p == '!' || *p == '/' || *p == '?')));
          p++)
       ;