* library/prefs.tcl (escape_value): Update to work

        with Tcl's new and old syntax.

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 5ab6423..90ea5e5 100644 (file)
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,16 @@
+2001-09-27  Keith Seitz  <keiths@redhat.com>
+
+        * library/prefs.tcl (escape_value): Update to work
+        with Tcl's new and old syntax.
+
+2001-09-19  Keith Seitz  <keiths@redhat.com>
+
+       * library/main.tcl: Append iwidgets library path, if needed.
+       * generic/gdbtk.c (gdbtk_init): Add TCLLIBPATH to iwidgets
+       package index.
+       Define IWIDGETS_LIBRARY in interpreter so that we can add
+       this path to the auto_path at the right time later.
+
 2001-09-10  Ian Roxborough <irox@redhat.com>
 
        * generic/gdbtk.c (gdbtk_init): Set IWIDGETS_LIBRARY if

diff --git a/gdb/gdbtk/library/prefs.tcl b/gdb/gdbtk/library/prefs.tcl
index cb3a649..bad5146 100644 (file)
--- a/gdb/gdbtk/library/prefs.tcl
+++ b/gdb/gdbtk/library/prefs.tcl
@@ -217,7 +217,12 @@ proc escape_value {val} {
   # We use a URL-style quoting.  We encode `=', `%', the `[]'
   # characters and newlines.  We use a cute trick here: we regsub in
   # command expressions which we then expand using subst.
-  regsub -all -- "(\[\]\[=%\n\])" $val \
+  if {[info tclversion] >= 8.1} {
+    set expr {([\[\]=%\n])}
+  } else {
+    set expr "(\[\]\[=%\n\])"
+  }
+  regsub -all -- $expr $val \
     {[format "%%%02x" [scan {\1} %c x; set x]]} newval
   return [subst -nobackslashes -novariables $newval]
 }