Index: gdb/gdbtk/ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/ChangeLog,v
retrieving revision 1.372
diff -u -p -r1.372 ChangeLog
--- gdb/gdbtk/ChangeLog	11 Nov 2005 17:19:06 -0000	1.372
+++ gdb/gdbtk/ChangeLog	29 Nov 2005 10:58:48 -0000
@@ -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>:
Index: gdb/gdbtk/README
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/README,v
retrieving revision 1.3
diff -u -p -r1.3 README
--- gdb/gdbtk/README	12 Sep 2005 16:00:36 -0000	1.3
+++ gdb/gdbtk/README	29 Nov 2005 10:58:48 -0000
@@ -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.
Index: gdb/gdbtk/library/prefs.tcl
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/library/prefs.tcl,v
retrieving revision 1.30
diff -u -p -r1.30 prefs.tcl
--- gdb/gdbtk/library/prefs.tcl	27 Aug 2004 23:13:14 -0000	1.30
+++ gdb/gdbtk/library/prefs.tcl	29 Nov 2005 10:58:48 -0000
@@ -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]} {