diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:37 -0700 |
| commit | 27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279 (patch) | |
| tree | c0d0d6e3e10b5e1a2b9be8eb2de1a4b49448e97b /git-gui/lib/option.tcl | |
| parent | cd030c3a7053aec0f9dbf321ef139ce02a821f3b (diff) | |
| parent | c288a2f1316b642ff073d4213cf691297610503c (diff) | |
| download | git-27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279.tar.gz git-27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279.tar.xz | |
Merge branch 'maint'
* maint: (46 commits)
git-gui: Changed blame header bar background to match main window
git-gui: Favor the original annotations over the recent ones
git-gui: Improve our labeling of blame annotation types
git-gui: Use three colors for the blame viewer background
git-gui: Jump to original line in blame viewer
git-gui: Display both commits in our tooltips
git-gui: Run blame twice on the same file and display both outputs
git-gui: Display the "Loading annotation..." message in italic
git-gui: Rename fields in blame viewer to better descriptions
git-gui: Label the uncommitted blame history entry
git-gui: Switch internal blame structure to Tcl lists
git-gui: Cleanup redundant column management in blame viewer
git-gui: Better document our blame variables
git-gui: Remove unused commit_list from blame viewer
git-gui: Automatically expand the line number column as needed
git-gui: Make the line number column slightly wider in blame
git-gui: Use lighter colors in blame view
git-gui: Remove unnecessary space between columns in blame viewer
git-gui: Remove the loaded column from the blame viewer
git-gui: Clip the commit summaries in the blame history menu
...
Diffstat (limited to 'git-gui/lib/option.tcl')
| -rw-r--r-- | git-gui/lib/option.tcl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl index 17fcc65f7..b29e14e64 100644 --- a/git-gui/lib/option.tcl +++ b/git-gui/lib/option.tcl @@ -15,6 +15,9 @@ proc save_config {} { font configure ${font}bold \ -family $global_config_new(gui.$font^^family) \ -size $global_config_new(gui.$font^^size) + font configure ${font}italic \ + -family $global_config_new(gui.$font^^family) \ + -size $global_config_new(gui.$font^^size) set global_config_new(gui.$name) [font configure $font] unset global_config_new(gui.$font^^family) unset global_config_new(gui.$font^^size) @@ -173,7 +176,7 @@ proc do_options {} { {i-1..5 merge.verbosity {Merge Verbosity}} {b gui.trustmtime {Trust File Modification Timestamps}} - {i-1..99 gui.diffcontext {Number of Diff Context Lines}} + {i-0..99 gui.diffcontext {Number of Diff Context Lines}} {t gui.newbranchtemplate {New Branch Name Template}} } { set type [lindex $option 0] |