merge revision(s) 49223: [Backport #10732]

* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
	  CR.  should check if substitution occurred too.
	  [ruby-dev:48813] [Bug #10732]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-01-19 02:45:40 +00:00
parent 459c590ca8
commit 9dd9feab8a
4 changed files with 14 additions and 5 deletions

View file

@ -56,6 +56,9 @@ class TestRDocText < RDoc::TestCase
assert_equal('. .',
expand_tabs(".\t\t."), 'dot tab tab dot')
assert_equal('a a',
Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return")
end
def test_expand_tabs_encoding