Index: BOOK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/final-system/common/vim.xml	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -34,8 +34,4 @@
     </tip>
 
-    <para os="a">First, unpack both <filename>vim-&vim-version;.tar.bz2</filename>
-    and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename>
-    archives into the same directory.</para>
-
     <para os="p1">The following patch merges all updates from the &vim-version; Branch
     from the Vim developers:</para>
@@ -51,5 +47,5 @@
     <para os="d">Prepare Vim for compilation:</para>
 
-<screen os="e"><userinput>CPPFLAGS="-DUNUSED=" ./configure \
+<screen os="e"><userinput>./configure \
     --prefix=/usr --enable-multibyte</userinput></screen>
 
Index: BOOK/final-system/multilib/vim.xml
===================================================================
--- BOOK/final-system/multilib/vim.xml	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/final-system/multilib/vim.xml	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -28,8 +28,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
@@ -51,5 +47,5 @@
 
 <screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    CPPFLAGS="-DUNUSED=" ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --enable-multibyte</userinput></screen>
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/introduction/common/changelog.xml	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -41,4 +41,7 @@
       <para>January 8, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Vim to 7.3.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Udev to 165.</para>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/materials/common/packages.xml	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -529,13 +529,4 @@
 
     <varlistentry>
-      <term>Vim (&vim-version;) language files (optional) - <token>&vim-language-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&vim-language-home;"/></para>
-        <para>Download: <ulink url="&vim-language-url;"/></para>
-        <para>MD5 sum: <literal>&vim-language-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>XZ Utils  (&xz-version;) - <token>&xz-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/packages.ent	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -423,14 +423,10 @@
 <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
 
-<!ENTITY vim-version "7.2">
-<!ENTITY vim-version2 "72">
-<!ENTITY vim-size "7,034 KB">
+<!ENTITY vim-version "7.3">
+<!ENTITY vim-version2 "73">
+<!ENTITY vim-size "8,868 KB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "f0901284b338e448bfd79ccca0041254">
+<!ENTITY vim-md5 "5b9510a17074e2b37d8bb38ae09edbf2">
 <!ENTITY vim-home "http://www.vim.org">
-<!ENTITY vim-language-size "1,333 KB">
-<!ENTITY vim-language-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz">
-<!ENTITY vim-language-md5 "d8884786979e0e520c112faf2e176f05">
-<!ENTITY vim-language-home " ">
 
 <!ENTITY xz-version "5.0.0">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/patches.ent	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -69,7 +69,7 @@
 <!ENTITY texinfo-new_compressors-patch-size "2 KB">
 
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-21.patch">
-<!ENTITY vim-branch_update-patch-md5 "68e540fbf2a06d9760a9b4d4b486b506">
-<!ENTITY vim-branch_update-patch-size "737 KB">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
+<!ENTITY vim-branch_update-patch-md5 "c1866b7f2f945993b8fc2bb94606bc17">
+<!ENTITY vim-branch_update-patch-size "220 KB">
 
 <!-- Start of multilib patches -->
Index: BOOK/temp-system/common/vim.xml
===================================================================
--- BOOK/temp-system/common/vim.xml	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/temp-system/common/vim.xml	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -25,8 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
@@ -34,4 +30,10 @@
     href="../../final-system/common/vim.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="s1">The configure script has a single hard coded test that
+    cannot be bypassed with a cache entry. Disable this test with the
+    following command:</para>
+
+<screen os="s2"><userinput>sed -i "/using uint32_t/s/as_fn_error/#&amp;/" src/auto/configure</userinput></screen>
 
     <para os="c1">The <command>configure</command> script is full of logic
@@ -49,4 +51,7 @@
 vim_cv_tty_group=world
 ac_cv_sizeof_int=4
+ac_cv_sizeof_long=4
+ac_cv_sizeof_time_t=4
+ac_cv_sizeof_off_t=4
 EOF</userinput></screen>
 
@@ -61,5 +66,5 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>CPPFLAGS="-DUNUSED=" ./configure \
+<screen os="e"><userinput>./configure \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --prefix=/tools --enable-multibyte --enable-gui=no \
Index: BOOK/temp-system/multilib/vim.xml
===================================================================
--- BOOK/temp-system/multilib/vim.xml	(revision f42e5c15d61cddbc2fab1347644bdfe67bfb066f)
+++ BOOK/temp-system/multilib/vim.xml	(revision 6c5a343a617ff57d7560c9a344da1c0c894502da)
@@ -25,8 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
@@ -34,4 +30,12 @@
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -55,5 +59,5 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" CPPFLAGS="-DUNUSED=" \
+<screen os="e"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
   ./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
   --prefix=/tools --enable-multibyte --enable-gui=no \
