diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 232ce42f2f6..161938ccdaa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-06  Fernando Nasser  <fnasser@redhat.com>
+
+	* cli/cli-decode.c (lookup_cmd): Change disabled code into comment.
+
 2000-12-06  Fernando Nasser  <fnasser@redhat.com>
 
 	* cli/cli-decode.c (lookup_cmd): Remove old stale copy of this routine
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 661f9e527e7..9bedba11180 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -914,15 +914,9 @@ lookup_cmd (char **line, struct cmd_list_element *list, char *cmdtype,
   struct cmd_list_element *last_list = 0;
   struct cmd_list_element *c =
   lookup_cmd_1 (line, list, &last_list, ignore_help_classes);
-#if 0
-  /* This is wrong for complete_command.  */
-  char *ptr = (*line) + strlen (*line) - 1;
 
-  /* Clear off trailing whitespace.  */
-  while (ptr >= *line && (*ptr == ' ' || *ptr == '\t'))
-    ptr--;
-  *(ptr + 1) = '\0';
-#endif
+  /* Note: Do not remove trailing whitespace here because this
+     would be wrong for complete_command.  Jim Kingdon  */
 
   if (!c)
     {