Skip to content

Commit

Permalink
Merge pull request #51 from ebruck/tabsize
Browse files Browse the repository at this point in the history
Added tabsize option
  • Loading branch information
jeffkaufman committed May 2, 2016
2 parents 78938d3 + b586bec commit d4460b9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -38,6 +38,7 @@ Show differences between files in a two column view.
--show-all-spaces color all non-matching whitespace including that which
is not needed for drawing the eye to changes. Slow,
ugly, displays all changes
--tabsize=TABSIZE tab stop spacing
-u, --patch generate patch. This is always true, and only exists
for compatibility
-U NUM, --unified=NUM, --numlines=NUM
Expand Down
5 changes: 4 additions & 1 deletion icdiff
Expand Up @@ -470,6 +470,8 @@ def start():
help="color all non-matching whitespace including "
"that which is not needed for drawing the eye to "
"changes. Slow, ugly, displays all changes")
parser.add_option("--tabsize", default=8,
help="tab stop spacing")
parser.add_option("-u", "--patch", default=True,
action="store_true",
help="generate patch. This is always true, "
Expand Down Expand Up @@ -588,7 +590,8 @@ def diff_files(options, a, b):
show_all_spaces=options.show_all_spaces,
highlight=options.highlight,
no_bold=options.no_bold,
line_numbers=options.line_numbers)
line_numbers=options.line_numbers,
tabsize=int(options.tabsize))
for line in cd.make_table(
lines_a, lines_b, headers[0], headers[1],
context=(not options.whole_file),
Expand Down

0 comments on commit d4460b9

Please sign in to comment.