[DRE-commits] [ruby-org] 194/303: Merge branch 'table-with-hline'

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository ruby-org.

commit f479f1f285477cc7cf540da622098e00f198bd57
Merge: 8f5e1c0 eff8fb5
Author: Waldemar Quevedo <waldemar.quevedo at gmail.com>
Date:   Sun Oct 7 13:40:59 2012 +0900

    Merge branch 'table-with-hline'

 lib/org-ruby/parser.rb         |   15 +++++++--------
 spec/data/tables.org           |    6 ++++++
 spec/html_examples/tables.html |    6 ++++++
 spec/html_examples/tables.org  |    7 +++++++
 spec/parser_spec.rb            |    9 +++++++++
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --cc lib/org-ruby/parser.rb
index d2266cc,eba3573..47cd5cd
--- a/lib/org-ruby/parser.rb
+++ b/lib/org-ruby/parser.rb
@@@ -156,9 -156,8 +156,8 @@@ module Orgmod
  
          when :src_code
  
-           line = Line.new line, self
            if line.end_block? and line.code_block?
 -            mode = :normal            
 +            mode = :normal
            else
              line.assigned_paragraph_type = :src
            end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-org.git