From 87415d6e36d8abb7084823dd412902aeb8b61aea Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavelo@centrum.sk>
Date: Wed, 17 Nov 2010 14:49:03 +0100
Subject: [PATCH] xftfont is renamed to font

whether the font setting specifies an X or an Xft font depends on the use_xft setting.
---
 convert.lua             | 5 +++--
 doc/config_settings.xml | 9 ---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/convert.lua b/convert.lua
index 7c8ab734..b8034a73 100755
--- a/convert.lua
+++ b/convert.lua
@@ -72,9 +72,10 @@ local function handle(setting, value)
     elseif not num_setting[setting] then
         if setting == 'alignment' and value:len() == 2 then
             value = alignment_map(value:sub(1,1)) .. '_' .. alignment_map(value:sub(2,2));
-        end;
-        if colour_setting[setting] and value:match('^[0-9a-fA-F]+$') then
+        elseif colour_setting[setting] and value:match('^[0-9a-fA-F]+$') then
             value = '#' .. value;
+        elseif setting == 'xftfont' then
+            setting = 'font';
         end;
         value = quote(value);
     end;
diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index 3f6f987a..df2d60e9 100644
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -1043,13 +1043,4 @@
         1 and 0. 
         <para /></listitem>
     </varlistentry>
-    <varlistentry>
-        <term>
-            <command>
-                <option>xftfont</option>
-            </command>
-        </term>
-        <listitem>Xft font to use. 
-        <para /></listitem>
-    </varlistentry>
 </variablelist>