diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-04-23 21:38:30 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-04-23 21:38:30 -0400 |
| commit | ca19404876451ea8be0cc5b3ed561344b5fc80c5 (patch) | |
| tree | 10d36475d64ae8d7077cd4f12bfd2bcac2f167c3 | |
| parent | dd70f3dbe48b9e30589c5832e95229b474651d6a (diff) | |
| parent | ddc360314544a21638fd0658218bbc37aafedd6f (diff) | |
| download | git-ca19404876451ea8be0cc5b3ed561344b5fc80c5.tar.gz git-ca19404876451ea8be0cc5b3ed561344b5fc80c5.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Don't use '$$cr master' with aspell earlier than 0.60
| -rw-r--r-- | lib/spellcheck.tcl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/spellcheck.tcl b/lib/spellcheck.tcl index 9be748683..78f344f08 100644 --- a/lib/spellcheck.tcl +++ b/lib/spellcheck.tcl @@ -84,13 +84,19 @@ method _connect {pipe_fd} { regexp \ {International Ispell Version .* \(but really (Aspell .*?)\)$} \ $s_version _junk s_version + regexp {^Aspell (\d)+\.(\d+)} $s_version _junk major minor puts $pipe_fd ! ; # enable terse mode - puts $pipe_fd {$$cr master} ; # fetch the language - flush $pipe_fd - gets $pipe_fd s_lang - regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang + # fetch the language + if {$major > 0 || ($major == 0 && $minor >= 60)} { + puts $pipe_fd {$$cr master} + flush $pipe_fd + gets $pipe_fd s_lang + regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang + } else { + set s_lang {} + } if {$::default_config(gui.spellingdictionary) eq {} && [get_config gui.spellingdictionary] eq {}} { |