diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 07:13:13 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 07:13:13 +0000 |
| commit | d65000915192052ea5a54ece9b001a0a84aa6c4c (patch) | |
| tree | 7761223ad3558aabd4d6c21ee3f844fb0f5c8a79 /lib | |
| parent | 8d4aeb83454fa4ae5f48b06973867ec0b4771153 (diff) | |
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_0_0@49445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/text.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb index c731dde097..46b53276b5 100644 --- a/lib/rdoc/text.rb +++ b/lib/rdoc/text.rb @@ -68,11 +68,11 @@ module RDoc::Text expanded = [] text.each_line do |line| - line.gsub!(/^((?:.{8})*?)([^\t\r\n]{0,7})\t/) do + nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do r = "#{$1}#{$2}#{' ' * (8 - $2.size)}" r.force_encoding text.encoding if Object.const_defined? :Encoding r - end until line !~ /\t/ + end expanded << line end |