summaryrefslogtreecommitdiff
path: root/src/misc2.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-06-25 14:39:50 +0200
committerBram Moolenaar <Bram@vim.org>2014-06-25 14:39:50 +0200
commit597a422416f37f8e22ed8f561667d6bab8814958 (patch)
tree8bada5798d608ac2a37b7f0ddbf7a24e8da4bd25 /src/misc2.c
parent15a35c4f4a1670dd6ca228068a451f78d2bf75e0 (diff)
downloadvim-git-597a422416f37f8e22ed8f561667d6bab8814958.tar.gz
updated for version 7.4.338v7.4.338
Problem: Cannot wrap lines taking indent into account. Solution: Add the 'breakindent' option. (many authors, final improvements by Christian Brabandt)
Diffstat (limited to 'src/misc2.c')
-rw-r--r--src/misc2.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/misc2.c b/src/misc2.c
index b0673d443..1a5b370ba 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -201,10 +201,10 @@ coladvance2(pos, addspaces, finetune, wcol)
{
/* Count a tab for what it's worth (if list mode not on) */
#ifdef FEAT_LINEBREAK
- csize = win_lbr_chartabsize(curwin, ptr, col, &head);
+ csize = win_lbr_chartabsize(curwin, line, ptr, col, &head);
mb_ptr_adv(ptr);
#else
- csize = lbr_chartabsize_adv(&ptr, col);
+ csize = lbr_chartabsize_adv(line, &ptr, col);
#endif
col += csize;
}
@@ -2156,7 +2156,8 @@ ga_append(gap, c)
}
}
-#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264)
+#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264) \
+ || defined(PROTO)
/*
* Append the text in "gap" below the cursor line and clear "gap".
*/