summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPat Thoyts <patthoyts@users.sourceforge.net>2011-10-19 13:29:52 +0100
committerPat Thoyts <patthoyts@users.sourceforge.net>2011-10-19 13:29:52 +0100
commit8eaf24b93bdb49d5adfb2f52f0f14dd01735db37 (patch)
tree36bf7f66526310f144ed3668c470a5b11ac9fe48
parentb66f4f7aa750ebebbd5186e1cafeee76df4691f8 (diff)
downloadgit-8eaf24b93bdb49d5adfb2f52f0f14dd01735db37.tar.gz
git-gui: enable the smart case sensitive search only if gui.search.smartcase is true
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
-rw-r--r--lib/search.tcl10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/search.tcl b/lib/search.tcl
index db88d87c51..04a316bbb2 100644
--- a/lib/search.tcl
+++ b/lib/search.tcl
@@ -11,6 +11,7 @@ field regexpsearch
field default_regexpsearch
field casesensitive
field default_casesensitive
+field smartcase
field searchdirn -forwards
field history
@@ -25,7 +26,8 @@ constructor new {i_w i_text args} {
set ctext $i_text
set default_regexpsearch [is_config_true gui.search.regexp]
- if {[is_config_true gui.search.smartcase]} {
+ set smartcase [is_config_true gui.search.smartcase]
+ if {$smartcase} {
set default_casesensitive 0
} else {
set default_casesensitive 1
@@ -155,8 +157,10 @@ method _incrsearch {} {
if {[catch {$ctext index anchor}]} {
$ctext mark set anchor [_get_new_anchor $this]
}
- if {[regexp {[[:upper:]]} $searchstring]} {
- set casesensitive 1
+ if {$smartcase} {
+ if {[regexp {[[:upper:]]} $searchstring]} {
+ set casesensitive 1
+ }
}
if {$searchstring ne {}} {
set here [_do_search $this anchor mlen]