From dc853cdd7fc6b17faef27bdf3eb7bbabb3a3bea5 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Mon, 14 Jul 2008 11:50:06 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1108 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/mbyte.c   | 6 ------
 src/version.c | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mbyte.c b/src/mbyte.c
index 38bec9d8..a2100b0f 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2448,8 +2448,6 @@ dbcs_head_off(base, p)
     return (q == p) ? 0 : 1;
 }
 
-#if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
-	|| defined(PROTO)
 /*
  * Special version of dbcs_head_off() that works for ScreenLines[], where
  * single-width DBCS_JPNU characters are stored separately.
@@ -2484,7 +2482,6 @@ dbcs_screen_head_off(base, p)
     }
     return (q == p) ? 0 : 1;
 }
-#endif
 
     int
 utf_head_off(base, p)
@@ -2934,8 +2931,6 @@ mb_lefthalve(row, col)
 					LineOffset[row] + screen_Columns) > 1;
 }
 
-# if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
-	|| defined(PROTO)
 /*
  * Correct a position on the screen, if it's the right halve of a double-wide
  * char move it to the left halve.  Returns the corrected column.
@@ -2956,7 +2951,6 @@ mb_fix_col(col, row)
 	return col - 1;
     return col;
 }
-# endif
 #endif
 
 #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) || defined(PROTO)
diff --git a/src/version.c b/src/version.c
index 21d7b143..c8565c44 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1,
+/**/
     0
 };
 
-- 
2.11.4.GIT