Skip to content

gitk: Persist config for ignore space and diff mode #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lostindark wants to merge 1 commit into
base: master
Choose a base branch
from
Open

gitk: Persist config for ignore space and diff mode #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions gitk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2668,7 +2668,6 @@ proc makewindow {} {
-command changeignorespace -variable ignorespace
pack .bleft.mid.ignspace -side left -padx 5

set worddiff [mc "Line diff"]
makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \
[mc "Markup words"] [mc "Color words"]
trace add variable worddiff write changeworddiff
Expand Down Expand Up @@ -12594,7 +12593,7 @@ set diffbgcolors {"#fff3f3" "#f0fff0"}
set diffcontext 3
set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
set ignorespace 0
set worddiff ""
set worddiff [mc "Line diff"]
set markbgcolor "#e0e0ff"

set headbgcolor "#00ff00"
Expand Down Expand Up @@ -12675,6 +12674,7 @@ set config_variables {
headfgcolor
headoutlinecolor
hideremotes
ignorespace
indexcirclecolor
kscroll
limitdiffs
Expand Down Expand Up @@ -12708,6 +12708,7 @@ set config_variables {
uifont
visiblerefs
web_browser
worddiff
workingfilescirclecolor
wrapcomment
wrapdefault
Expand Down