Merged r1473, r1476, r1477, r1478, r1481, r1482, r1484 to r1487, r1491 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-14 11:59:59 +00:00
parent 2074f0ab41
commit 15ecbbf928
14 changed files with 116 additions and 88 deletions
@@ -122,7 +122,7 @@ module Scanners
          end

        when :include_expected
-          if scan(/<[^>\n]+>?|"[^"\n\\]*(?:\\.[^"\n\\]*)*"?/)
+          if scan(/[^\n]+/)
            kind = :include
            state = :initial