aboutsummaryrefslogtreecommitdiff
path: root/src/diff.c
diff options
context:
space:
mode:
authorPetter Wahlman <pwahlman@cisco.com>2014-03-16 08:20:00 +0100
committerThiago de Arruda <tpadilha84@gmail.com>2014-03-19 07:53:16 -0300
commitedabc6f4c7277262568801ff870808170ac32327 (patch)
tree9e34374d5d6a2816a0bc432bab84e540be9d3f18 /src/diff.c
parent59f2430a8d543fc57a31d489a649ec87a6ca9715 (diff)
downloadrneovim-edabc6f4c7277262568801ff870808170ac32327.tar.gz
rneovim-edabc6f4c7277262568801ff870808170ac32327.tar.bz2
rneovim-edabc6f4c7277262568801ff870808170ac32327.zip
adapt to the style guildelines
semi-automated harvest of low hanging fruit: change the unorthodox use of whitespace.
Diffstat (limited to 'src/diff.c')
-rw-r--r--src/diff.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c
index bdf78dd708..0764715685 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1743,7 +1743,7 @@ void diff_set_topline(win_T *fromwin, win_T *towin)
if (dp->df_count[toidx] == dp->df_count[fromidx]) {
// same number of lines: use same filler count
towin->w_topfill = fromwin->w_topfill;
- } else if (dp->df_count[toidx] > dp->df_count[fromidx]) {
+ } else if (dp->df_count[toidx] > dp->df_count[fromidx]) {
if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) {
// more lines in towin and fromwin doesn't show diff
// lines, only filler lines
@@ -1869,7 +1869,8 @@ int diffopt_changed(void)
/// Return TRUE if 'diffopt' contains "horizontal".
///
/// @return TRUE if 'diffopt' contains "horizontal"
-int diffopt_horizontal(void) {
+int diffopt_horizontal(void)
+{
return (diff_flags & DIFF_HORIZONTAL) != 0;
}