summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-03-09 13:30:56 +0000
committerBram Moolenaar <Bram@vim.org>2008-03-09 13:30:56 +0000
commit5bbc21de819567f2ab8aa4ef8e154b7eaa73ff83 (patch)
tree2e6c33d84fafb4ca7dfe5c6cbb60bee9480876f4
parente3b3f28db9f438e8b67495b152ce483807312cea (diff)
downloadvim-5bbc21de819567f2ab8aa4ef8e154b7eaa73ff83.zip
updated for version 7.1-268
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index a73992725..7be34fa99 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4527,7 +4527,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
#endif
col == W_WIDTH(wp) - 1)
&& (*ptr != NUL
- || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
+ || (wp->w_p_list && lcs_eol_one > 0)
|| (n_extra && (c_extra != NUL || *p_extra != NUL))))
{
c = lcs_ext;
diff --git a/src/version.c b/src/version.c
index d3bd54a10..d9150a90b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 268,
+/**/
267,
/**/
266,