From 69fc1b2a75f4de8908f928b29af5e25a0f71ea56 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Sat, 4 Oct 2008 06:03:09 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1215 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/normal.c  |  3 ++-
 src/option.c  |  5 +++++
 src/screen.c  | 14 +++++++++++---
 src/version.c |  6 ++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/normal.c b/src/normal.c
index 462bd35f..c1e630a3 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1132,7 +1132,8 @@ getcount:
 	out_flush();
 #endif
 #ifdef FEAT_AUTOCMD
-    did_cursorhold = FALSE;
+    if (ca.cmdchar != K_IGNORE)
+	did_cursorhold = FALSE;
 #endif
 
     State = NORMAL;
diff --git a/src/option.c b/src/option.c
index 04581a8e..20fef410 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7974,6 +7974,11 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
 	else /* curwin->w_p_scr > curwin->w_height */
 	    curwin->w_p_scr = curwin->w_height;
     }
+    if (p_hi < 0)
+    {
+	errmsg = e_positive;
+	p_hi = 0;
+    }
     if (p_report < 0)
     {
 	errmsg = e_positive;
diff --git a/src/screen.c b/src/screen.c
index 45ccf003..684c3942 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2439,9 +2439,17 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
 
 #ifdef FEAT_SYN_HL
     /* Show 'cursorcolumn' in the fold line. */
-    if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
-	ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
-		 ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
+    if (wp->w_p_cuc)
+    {
+	txtcol += wp->w_virtcol;
+	if (wp->w_p_wrap)
+	    txtcol -= wp->w_skipcol;
+	else
+	    txtcol -= wp->w_leftcol;
+	if (txtcol >= 0 && txtcol < W_WIDTH(wp))
+	    ScreenAttrs[off + txtcol] = hl_combine_attr(
+				 ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
+    }
 #endif
 
     SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
diff --git a/src/version.c b/src/version.c
index c3c93477..45bb7e5f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,12 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    25,
+/**/
+    24,
+/**/
+    23,
+/**/
     22,
 /**/
     21,
-- 
2.11.4.GIT