diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-16 15:51:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-16 15:51:11 -0800 |
| commit | 6e13921b4f7adcc7316a76c0c4955b85b1589a65 (patch) | |
| tree | d741279335c8a6b9e1565d1a999bc0018545a754 /git-gui/lib/option.tcl | |
| parent | bf31115312aefd36f1571379842eebebf34dcb55 (diff) | |
| parent | 941930732fc0bbffbd19e9fa09fe00bc1512a3a7 (diff) | |
| download | git-6e13921b4f7adcc7316a76c0c4955b85b1589a65.tar.gz git-6e13921b4f7adcc7316a76c0c4955b85b1589a65.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Fix the search bar destruction handler.
Update the po template
git-gui: Implement automatic rescan after Tool execution.
git-gui: Allow Tools request arguments from the user.
git-gui: Add a Tools menu for arbitrary commands.
git-gui: Fix the after callback execution in rescan.
git-gui: Implement system-wide configuration handling.
git-gui: try to provide a window icon under X
Diffstat (limited to 'git-gui/lib/option.tcl')
| -rw-r--r-- | git-gui/lib/option.tcl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl index c80c93987..1d55b49c9 100644 --- a/git-gui/lib/option.tcl +++ b/git-gui/lib/option.tcl @@ -25,7 +25,7 @@ proc config_check_encodings {} { proc save_config {} { global default_config font_descs - global repo_config global_config + global repo_config global_config system_config global repo_config_new global_config_new global ui_comm_spell @@ -49,7 +49,7 @@ proc save_config {} { foreach name [array names default_config] { set value $global_config_new($name) if {$value ne $global_config($name)} { - if {$value eq $default_config($name)} { + if {$value eq $system_config($name)} { catch {git config --global --unset $name} } else { regsub -all "\[{}\]" $value {"} value @@ -284,17 +284,17 @@ proc do_options {} { } proc do_restore_defaults {} { - global font_descs default_config repo_config + global font_descs default_config repo_config system_config global repo_config_new global_config_new foreach name [array names default_config] { - set repo_config_new($name) $default_config($name) - set global_config_new($name) $default_config($name) + set repo_config_new($name) $system_config($name) + set global_config_new($name) $system_config($name) } foreach option $font_descs { set name [lindex $option 0] - set repo_config(gui.$name) $default_config(gui.$name) + set repo_config(gui.$name) $system_config(gui.$name) } apply_config |