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

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index 3bfa2edf1ad8e5abb48df360758177a594dab1a1..ea80df009226d0ff14e8fe423abfe3d7a94ef56b 100644 (file)
--- 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 01c2c4f0d1a51d29cc554b9209d7dbcd0af90515..7f018e4009dd17941d93bc9146fee7e3a2e07f0e 100644 (file)
--- 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} {