Various i18n-related changes to Vim. They need to be duplicated in BLFS also

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3772 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 43 insertions, 12 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ceffee332..70e1892f4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -78,6 +78,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>udev-026</para></listitem>
 <listitem><para>udev-026-config-1.patch</para></listitem>
 <listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
+<listitem><para>vim-6.3 language files</para></listitem>
 </itemizedlist>
 </listitem>
  
@@ -104,6 +105,14 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 10, 2004 [alexander]: Added a command to autodetect the
+character set of files being edited to /etc/vimrc
+</para></listitem>
+
+<listitem><para>June 10, 2004 [alexander]: Added vim language files. Moved
+vim after gettext in order for them to work
+</para></listitem>
+
 <listitem><para>June 9, 2004 [jeremy]: Upgraded to M4-1.4.1, after 9 years!
 </para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 4ae63725f..e2f7b2d46 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -383,13 +383,21 @@
 </varlistentry>
 
 <varlistentry>
-<term>Vim (&vim-version;) - 3,193 KB:</term>
+<term>Vim (&vim-version;) - 3,612 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;vim/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
+<term>Vim (&vim-version;) language files (optional) - 1,033 KB:</term>
+<listitem>
+<para><ulink url="&freshmeat;vim/"/></para>
+</listitem>
+</varlistentry>
+
+
+<varlistentry>
 <term>Zlib (&zlib-version;) - 277 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;zlib/"/></para>
@@ -398,7 +406,7 @@
 
 </variablelist>
 
-<para>Total size of these packages: 134 MB</para>
+<para>Total size of these packages: 135 MB</para>
 
 <note><para>1) File (&file-version;) may not be available by the time you read
 this. The site administrators of the master download location are known to occasionally
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index a99b76af8..f981c3d33 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -30,7 +30,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="less.xml"/>
@@ -38,6 +37,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="net-tools.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index ffb38e01e..66f529bdb 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -35,7 +35,10 @@ suggested installation instructions.</para>
 <sect2 role="installation">
 <title>Installation of Vim</title>
 
-<para>First change the default locations of the <filename>vimrc</filename> and
+<para>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. Then change the default locations of the <filename>vimrc</filename> and
 <filename>gvimrc</filename> configuration files to <filename class="directory">/etc</filename>.</para>
 
 <screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h
@@ -45,11 +48,14 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
 
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-<para>The optional <userinput>--enable-multibyte</userinput> switch
-includes multibyte editing support into
-vim. It is only needed for those people who ignore our recommendation not to
-use LFS in locales with multibyte character sets, but it does not hurt
-others.</para>
+<para>The optional but highly recommended
+<userinput>--enable-multibyte</userinput> switch
+includes support for editing files in multibyte character encodings into
+vim. It is needed for those people who ignore our recommendation not to
+use LFS in locales with multibyte character sets. It is also needed for
+people who want to be able to edit text files initially created
+in Linux distributions like Fedora Core
+that use UTF-8 as a default character set.</para>
 
 <para>Compile the package:</para>
 
@@ -99,6 +105,7 @@ set nocompatible
 set backspace=2
 syntax on
 set background=dark
+set fileencodings=ucs-bom,utf-8,<replaceable>your-8-bit-charset</replaceable>
 
 " End /etc/vimrc
 <userinput>EOF</userinput></screen>
@@ -112,7 +119,14 @@ backspacing over line breaks, autoindents and the start of insert. The
 syntax highliting, while <emphasis>set background=dark</emphasis> gives the
 highliting a better color scheme for use on the black background of a linux
 console.  If you later use X and terminals with a light background, changing
-this will be useful.</para>
+this will be useful. The <emphasis>set fileencodings=...</emphasis> makes
+<command>vim</command> capable of detecting the character set of the
+file being edited. This is useful because bleeding-edge distributions
+like Fedora Core use UTF-8, and conservative ones like Debian
+use traditional 8-bit encodings for text files. If you have not
+passed the <option>--enable-multibyte</option> switch to the
+<command>./configure</command> command above, this line will not work.
+</para>
 
 <para>Documentation for other available options can be obtained by running
 the following command:</para>
diff --git a/general.ent b/general.ent
index e7ec01baa..0faaaa39f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "CVS-20040609">
-<!ENTITY releasedate "June 9, 2004">
+<!ENTITY version "CVS-20040610">
+<!ENTITY releasedate "June 10, 2004">
 <!ENTITY milestone "6.0">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">