* gdbtk.tcl (create_command_window): Change a misspelled "get"

	to the intended "cget".
	(delete_line): Fix so it deletes the current line at the
	insertion cursor.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3ce18603a0eea19569c2b87603e891eabaf36047..d864dd967faeaef9568983ee345fe75885344a9e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+start-sanitize-gdbtk
+Fri May 17 13:54:34 1996  Fred Fish  <fnf@cygnus.com>
+
+       * gdbtk.tcl (create_command_window): Change a misspelled "get"
+       to the intended "cget".
+       (delete_line): Fix so it deletes the current line at the
+       insertion cursor.
+end-sanitize-gdbtk
+
 Fri May 17 13:31:04 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
        * sh-stub.c: New file, was config/sh/stub.c.

diff --git a/gdb/gdbtk.tcl b/gdb/gdbtk.tcl
index 3fcf2ce2d2080f34bed83d3b0bda49a224017edb..30af7b3b5df0d0c4c89968a830a23a4a7caba3d7 100644 (file)
--- a/gdb/gdbtk.tcl
+++ b/gdb/gdbtk.tcl
@@ -2315,7 +2315,7 @@ proc create_command_window {} {
         set bsBinding [bind Text <BackSpace>]
         bind .cmd.text <Delete> "delete_char %W ; $bsBinding; break"
        bind .cmd.text <BackSpace> {
-         if {([%W get -state] == "disabled")} { break }
+         if {([%W cget -state] == "disabled")} { break }
          delete_char %W
        }
        bind .cmd.text <Control-u> {
@@ -2400,18 +2400,27 @@ proc create_command_window {} {
        }
 }
 
+# Trim one character off the command line.  The argument is ignored.
+
 proc delete_char {win} {
   global command_line
   set tmp [expr [string length $command_line] - 2]
   set command_line [string range $command_line 0 $tmp]
 }
 
+# FIXME: This should actually check that the first characters of the current
+# line  match the gdb prompt, since the user can move the insertion point
+# anywhere.  It should also check that the insertion point is in the last
+# line of the text widget.
+
 proc delete_line {win} {
-  global command_line
+    global command_line
+    global gdb_prompt
 
-  $win delete {end linestart + 6 chars} end
-  $win see insert
-  set command_line {}
+    set tmp [string length $gdb_prompt]
+    $win delete "insert linestart + $tmp chars" "insert lineend"
+    $win see insert
+    set command_line {}
 }
 
 #