diff options
| -rw-r--r-- | chapter01/changelog.xml | 3 | ||||
| -rw-r--r-- | chapter06/vim.xml | 12 | ||||
| -rw-r--r-- | general.ent | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 1e9d2b98e..67c9eacdf 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -76,6 +76,9 @@ first a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>June 16, 2004 [alexander]: Removed the fileencodinfs line from +the /etc/vimrc file because of a bug</para></listitem> + <listitem><para>June 15, 2004 [winkie]: Corrected installation of Readline. </para></listitem> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 87342421a..7b978ffc7 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -105,7 +105,7 @@ the following:</para> set nocompatible set backspace=2 syntax on -set fileencodings=ucs-bom,utf-8,<replaceable>your-8-bit-charset</replaceable> +<!-- set fileencodings=ucs-bom,utf-8,<replaceable>your-8-bit-charset</replaceable> --> if (&term == "iterm") || (&term == "putty") set background=dark endif @@ -119,7 +119,11 @@ vi-compatible manner. Remove the "no" if you want the old <command>vi</command> behavior. The <emphasis>set backspace=2</emphasis> allows backspacing over line breaks, autoindents and the start of insert. The <emphasis>syntax on</emphasis> enables <command>vim</command>'s -syntax highliting. The <emphasis>set fileencodings=...</emphasis> makes +syntax highliting. +<!-- XXX: the ascii-only files are considered to be in utf-8 - that's not what +one expects . That's why fileencodings stuff is commented out for now + +The <emphasis>set fileencodings=...</emphasis> makes <command>vim</command> capable of automatically detecting the character set of the file being edited (replace "<replaceable>your-8-bit-charset</replaceable>" @@ -127,8 +131,8 @@ with the value appropriate for your country, e.g. iso-8859-15 in Italy). This line 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. +passed the <option>- -enable-multibyte</option> switch to the +<command>./configure</command> command above, this line will not work. --> Finally, the <emphasis>if</emphasis> statement with the <emphasis>set background=dark</emphasis> corrects <command>vim</command>'s guess about the background color of some terminal emulators. This gives the diff --git a/general.ent b/general.ent index 45a7db6e8..b0d98acd0 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "CVS-20040615"> -<!ENTITY releasedate "June 15, 2004"> +<!ENTITY version "CVS-20040616"> +<!ENTITY releasedate "June 16, 2004"> <!ENTITY milestone "6.0"> <!ENTITY lfs-root "http://www.linuxfromscratch.org/"> |