From e3880cd0bf84c36273118c2b31ec093f476136a8 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Thu, 19 Nov 2009 03:54:24 +0000
Subject: [PATCH] Merged from the latest developing branch.

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

diff --git a/src/fileio.c b/src/fileio.c
index b0b341a2..805ff873 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -146,7 +146,9 @@ static int get_mac_fio_flags __ARGS((char_u *ptr));
 # endif
 #endif
 static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+#ifdef TEMPDIRNAMES
 static void vim_settempdir __ARGS((char_u *tempdir));
+#endif
 #ifdef FEAT_AUTOCMD
 static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
 #endif
@@ -6995,6 +6997,7 @@ vim_deltempdir()
 }
 #endif
 
+#ifdef TEMPDIRNAMES
 /*
  * Directory "tempdir" was created.  Expand this name to a full path and put
  * it in "vim_tempdir".  This avoids that using ":cd" would confuse us.
@@ -7021,6 +7024,7 @@ vim_settempdir(tempdir)
 	vim_free(buf);
     }
 }
+#endif
 
 /*
  * vim_tempname(): Return a unique name that can be used for a temp file.
diff --git a/src/version.c b/src/version.c
index 63ab5161..248fac70 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    303,
+/**/
     302,
 /**/
     301,
-- 
2.11.4.GIT