summaryrefslogtreecommitdiff
path: root/gdb/gdbtk
diff options
context:
space:
mode:
authorAndrew Stubbs <andrew.stubbs@st.com>2005-11-29 11:09:41 +0000
committerAndrew Stubbs <andrew.stubbs@st.com>2005-11-29 11:09:41 +0000
commit9289b60684281e32cdfc2455b105def1fe71403d (patch)
tree746811d9d6841a9ea1834ad5b6e85bdde5e65ae0 /gdb/gdbtk
parent810649701bdd53f8142e2baab7f654d29e5dd316 (diff)
downloadgdb-9289b60684281e32cdfc2455b105def1fe71403d.tar.gz
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.
Diffstat (limited to 'gdb/gdbtk')
-rw-r--r--gdb/gdbtk/ChangeLog6
-rw-r--r--gdb/gdbtk/README3
-rw-r--r--gdb/gdbtk/library/prefs.tcl3
3 files changed, 11 insertions, 1 deletions
diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 39bf08dbadc..404a6552d52 100644
--- 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 363a985b45f..79cea281335 100644
--- 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 271a36b3007..a3951b597ad 100644
--- 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]} {