summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-02-21 02:48:21 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-02-21 05:22:06 (GMT)
commitf57ca1efe5b2e6c7ca7c2a08b0c342e2547c826c (patch)
tree6d06e3e4411dbf9e65fd006c3fc0d6e672eac908
parentf4d93486aea3a3c20ddef409e5bfd8a60efdc512 (diff)
downloadgit-f57ca1efe5b2e6c7ca7c2a08b0c342e2547c826c.zip
git-f57ca1efe5b2e6c7ca7c2a08b0c342e2547c826c.tar.gz
git-f57ca1efe5b2e6c7ca7c2a08b0c342e2547c826c.tar.bz2
git-gui: Ensure all spellchecker 'class' variables are initialized
If we somehow managed to get our spellchecker instance created but aspell wasn't startable we may not finish _connect and thus may find one or more of our fields was not initialized in the instance. If we have an instance but no version, there is no reason to show a version to the user in our about dialog. We effectively have no spellchecker available. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--lib/about.tcl3
-rw-r--r--lib/spellcheck.tcl14
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/about.tcl b/lib/about.tcl
index 47be8eb..241ab89 100644
--- a/lib/about.tcl
+++ b/lib/about.tcl
@@ -41,7 +41,8 @@ proc do_about {} {
append v "Tcl version $tcl_patchLevel"
append v ", Tk version $tk_patchLevel"
}
- if {[info exists ui_comm_spell]} {
+ if {[info exists ui_comm_spell]
+ && [$ui_comm_spell version] ne {}} {
append v "\n"
append v [$ui_comm_spell version]
}
diff --git a/lib/spellcheck.tcl b/lib/spellcheck.tcl
index a67a5f7..d0486f8 100644
--- a/lib/spellcheck.tcl
+++ b/lib/spellcheck.tcl
@@ -3,15 +3,15 @@
class spellcheck {
-field s_fd {} ; # pipe to aspell
-field s_version ; # aspell version string
-field s_lang ; # current language code
+field s_fd {} ; # pipe to aspell
+field s_version {} ; # aspell version string
+field s_lang {} ; # current language code
field w_text ; # text widget we are spelling
field w_menu ; # context menu for the widget
field s_menuidx 0 ; # last index of insertion into $w_menu
-field s_i ; # timer registration for _run callbacks
+field s_i {} ; # timer registration for _run callbacks
field s_clear 0 ; # did we erase mispelled tags yet?
field s_seen [list] ; # lines last seen from $w_text in _run
field s_checked [list] ; # lines already checked
@@ -21,6 +21,7 @@ field s_suggest ; # array, list of suggestions, keyed by misspelling
constructor init {pipe_fd ui_text ui_menu} {
set w_text $ui_text
set w_menu $ui_menu
+ array unset s_suggest
_connect $this $pipe_fd
return $this
@@ -88,7 +89,10 @@ method lang {{n {}}} {
}
method version {} {
- return "$s_version, $s_lang"
+ if {$s_version ne {}} {
+ return "$s_version, $s_lang"
+ }
+ return {}
}
method stop {} {