diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-17 04:42:49 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-17 04:42:49 +0300 |
commit | 67cdec1e58f1f9bc17d500b04e856042e0b2bf59 (patch) | |
tree | a38ac4515ec07dcd453a3a1accbedbb763d94b43 | |
parent | f124e986cf19e8f36895ae474d50f8d389e73d02 (diff) | |
parent | 740b9b9ff4db2c32eb655213b44e3e5249128426 (diff) |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Correct size of dictionary name widget in options dialog
git-gui: Paper bag fix bad string length call in spellchecker
-rw-r--r-- | git-gui/lib/option.tcl | 4 | ||||
-rw-r--r-- | git-gui/lib/spellcheck.tcl | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl index 3bfa2edf1a..ea80df0092 100644 --- a/git-gui/lib/option.tcl +++ b/git-gui/lib/option.tcl @@ -193,9 +193,7 @@ proc do_options {} { ${f}_config_new(gui.spellingdictionary) \ $all_dicts pack $w.$f.$optid.l -side left -anchor w -fill x - pack $w.$f.$optid.v -side left -anchor w \ - -fill x -expand 1 \ - -padx 5 + pack $w.$f.$optid.v -side right -anchor e -padx 5 pack $w.$f.$optid -side top -anchor w -fill x } unset all_dicts diff --git a/git-gui/lib/spellcheck.tcl b/git-gui/lib/spellcheck.tcl index 01c2c4f0d1..7f018e4009 100644 --- a/git-gui/lib/spellcheck.tcl +++ b/git-gui/lib/spellcheck.tcl @@ -308,7 +308,7 @@ method _read {} { # try to round out the word. # while {$curr ne $orig - && [string equal -length [llength $curr] $curr $orig]} { + && [string equal -length [string length $curr] $curr $orig]} { set n_loc [$w_text index "$e_loc +1c"] set n_curr [$w_text get $b_loc $n_loc] if {$n_curr eq $curr} { |