From 78483f4a15ff2fd27cd2c48aabbbf63f32863c1d Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Wed, 27 Feb 2008 05:19:16 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@922 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/ex_docmd.c | 1 +
 src/version.c  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 50c8f584..d5692c27 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3346,6 +3346,7 @@ set_one_cmd_context(xp, buff)
 #endif
 		    ))
 	    {
+		len = 0;  /* avoid getting stuck when space is in 'isfname' */
 		while (*p != NUL)
 		{
 #ifdef FEAT_MBYTE
diff --git a/src/version.c b/src/version.c
index 24b73441..d3a86e45 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 */
 /**/
+    265,
+/**/
     264,
 /**/
     263,
-- 
2.11.4.GIT