diff options
| author |  Alexander Gavrilov <angavrilov@gmail.com> | 2008-09-18 01:07:34 +0400 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-24 12:48:32 -0700 |
| commit | 3fe0162362f80262ed1965f19c1f57f298931c94 (patch) | |
| tree | dab7c45bb8241268d946bb281d30f4384cbf7b46 /git-gui.sh | |
| parent | git-gui: Add a menu of available encodings. (diff) | |
| download | tgif-3fe0162362f80262ed1965f19c1f57f298931c94.tar.xz | |
git-gui: Allow forcing display encoding for diffs using a submenu.
Add a submenu to allow dynamically changing the encoding to use
for diffs. Encoding settings are remembered while git-gui runs.
The rules are:
1) Encoding set for a specific file overrides gitattributes.
2) Last explicitly set value of the encoding overrides gui.encoding
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index b37148b7b2..03c450d73f 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -3010,6 +3010,14 @@ proc create_common_diff_popup {ctxm} { -command {incr_font_size font_diff 1} lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] $ctxm add separator + set emenu $ctxm.enc + menu $emenu + build_encoding_menu $emenu [list force_diff_encoding] + $ctxm add cascade \ + -label [mc "Encoding"] \ + -menu $emenu + lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] + $ctxm add separator $ctxm add command -label [mc "Options..."] \ -command do_options } |