From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>,
Paul Mackerras <paulus@ozlabs.org>
Subject: [PATCH] gitk: replace tabs with spaces (again)
Date: Tue, 3 Nov 2020 17:09:27 -0800 [thread overview]
Message-ID: <4c58637d96fe22747cd301e0f2e34d8c8b8f1f93.1604452145.git.liu.denton@gmail.com> (raw)
In e244588eb6 (gitk: replace tabs with spaces, 2020-09-10), tabs were
replaced with spaces so that indents consistently use spaces. However,
in 6cd80496e9 (gitk: Resize panes correctly when reducing window size,
2020-10-03), some tabs were erroneously reintroduced.
Convert these tabs back into spaces.
This was done mechanically by running:
$ expand -i gitk >gitk.new
$ mv gitk.new gitk
$ chmod +x gitk
This patch should be empty with `--ignore-all-space`.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
gitk | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gitk b/gitk
index 23d9dd1fe0..c31a8b4e2f 100755
--- a/gitk
+++ b/gitk
@@ -2955,9 +2955,9 @@ proc savestuff {w} {
proc resizeclistpanes {win w} {
global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} {
- if {[info exists oldsash($win)]} {
- set s0 [lindex $oldsash($win) 0]
- set s1 [lindex $oldsash($win) 1]
+ if {[info exists oldsash($win)]} {
+ set s0 [lindex $oldsash($win) 0]
+ set s1 [lindex $oldsash($win) 1]
} elseif {$use_ttk} {
set s0 [$win sashpos 0]
set s1 [$win sashpos 1]
@@ -2992,7 +2992,7 @@ proc resizeclistpanes {win w} {
$win sash place 0 $sash0 [lindex $s0 1]
$win sash place 1 $sash1 [lindex $s1 1]
}
- set oldsash($win) [list $sash0 $sash1]
+ set oldsash($win) [list $sash0 $sash1]
}
set oldwidth($win) $w
}
@@ -3000,8 +3000,8 @@ proc resizeclistpanes {win w} {
proc resizecdetpanes {win w} {
global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} {
- if {[info exists oldsash($win)]} {
- set s0 $oldsash($win)
+ if {[info exists oldsash($win)]} {
+ set s0 $oldsash($win)
} elseif {$use_ttk} {
set s0 [$win sashpos 0]
} else {
@@ -3024,7 +3024,7 @@ proc resizecdetpanes {win w} {
} else {
$win sash place 0 $sash0 [lindex $s0 1]
}
- set oldsash($win) $sash0
+ set oldsash($win) $sash0
}
set oldwidth($win) $w
}
--
2.29.2.286.g8a58376a31
reply other threads:[~2020-11-04 1:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4c58637d96fe22747cd301e0f2e34d8c8b8f1f93.1604452145.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=paulus@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).