Thanks for the patch haad, I've committed it to the trunk:
http://code.google.com/p/asciidoc/source/detail?r=f7205b3bb6daae1873337fcd20aeb5678f67d23f

Thanks to haad and Lex for tracking this one down.


Cheers, Stuart


On 05/03/11 00:06, haad wrote:

Hi,

Can someone please commit this to main repository ? It would be great
to have this fix in next update.


On Mar 1, 2:27 pm, haad<[email protected]>  wrote:
Hi,



Thanks for making a patch, I am on a machine where I can browse the
repository but can't try anything out.

The only comment I'd make is that the else clause you added does the
same as the end of the then clause, really all it needed was for the
line before to be moved out of the then clause :-)

Updated diff attached

diff -r 7fa2dd2b0531 asciidoc.py
--- a/asciidoc.py       Sun Feb 20 12:41:51 2011 +1300
+++ b/asciidoc.py       Tue Mar 01 14:26:01 2011 +0200
@@ -5580,7 +5580,7 @@
                  config.load_file('asciidoc.conf', indir,

include=['attributes','titles','specialchars'])
          else:
-            load_conffiles()
+            load_conffiles(include=['attributes'])
          document.update_attributes()
          # Check the infile exists.
          if infile != '<stdin>':
@@ -5615,8 +5615,8 @@
                  # Load document specific configuration files.
                  f = os.path.splitext(infile)[0]
                  config.load_file(f + '.conf')
-                config.load_file(f + '-' + document.backend +
'.conf')
-            load_conffiles()
+                config.load_file(f + '-' + document.backend +
'.conf')
+        load_conffiles()
          # Build outfile name.
          if outfile is None:
              outfile = os.path.splitext(infile)[0] + '.' +
document.backend


--
You received this message because you are subscribed to the Google Groups 
"asciidoc" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/asciidoc?hl=en.

Reply via email to