2005-11-29 Andrew Stubbs <andrew.stubbs@st.com>

	* library/prefs.tcl (pref_read): Read preferences file if environment
	variable INSIGHT_FORCE_READ_PREFERENCES is set (regardless of -nx).
	* README: Mention INSIGHT_FORCE_READ_PREFERENCES.

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 39bf08d..404a655 100644 (file)
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-29  Andrew Stubbs  <andrew.stubbs@st.com>
+
+       * library/prefs.tcl (pref_read): Read preferences file if environment
+       variable INSIGHT_FORCE_READ_PREFERENCES is set (regardless of -nx).
+       * README: Mention INSIGHT_FORCE_READ_PREFERENCES.
+
 2005-11-11  Keith Seitz  <keiths@redhat.com>
 
        From Spencer Oliver <spencer.oliver@anglia.com>:

diff --git a/gdb/gdbtk/README b/gdb/gdbtk/README
index 363a985..79cea28 100644 (file)
--- a/gdb/gdbtk/README
+++ b/gdb/gdbtk/README
@@ -72,6 +72,9 @@ install and the source trees.
        GDBTK_DEBUGFILE         Filename to send debug output
        GDBTK_TEST_RUNNING      Testsuite variable. See gdb/testsuite/gdb.gdbtk/README
                                for more information.
+       INSIGHT_FORCE_READ_PREFERENCES
+                               If set, read .gdbtkinit (or gdb.ini on windows)
+                               even when -nx is passed to GDB.
 
 All of the environment variables for controlling Insight are well documented
 in gdb/gdbtk/library/main.tcl. Search for "env" to find them all.

diff --git a/gdb/gdbtk/library/prefs.tcl b/gdb/gdbtk/library/prefs.tcl
index 271a36b..a3951b5 100644 (file)
--- a/gdb/gdbtk/library/prefs.tcl
+++ b/gdb/gdbtk/library/prefs.tcl
@@ -50,7 +50,8 @@ proc pref_read {} {
     set prefs_init_filename ".gdbtkinit"
   }
 
-  if {!$GDBStartup(inhibit_prefs)} {
+  if {!$GDBStartup(inhibit_prefs) \
+      || [info exists env(INSIGHT_FORCE_READ_PREFERENCES)]} {
     set file_opened 0
     if {[file exists $prefs_init_filename]} {
       if {[catch {open $prefs_init_filename r} fd]} {