diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2014-12-18 21:28:24 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2014-12-18 21:28:24 +0100 |
| commit | 7aa6ea080d05b7e6a70b076b25f37b72fd7669ad (patch) | |
| tree | 5134dda976acfa6746a53fd9def12937701d9850 /lib/coderay/encoders | |
| parent | bc4854fa426a39c2bd51b2fd1cfa0322a5a9a412 (diff) | |
| parent | 31a09b7599fb7c4b605869127e38617ce7619106 (diff) | |
| download | coderay-7aa6ea080d05b7e6a70b076b25f37b72fd7669ad.tar.gz | |
Merge branch 'master' into possible-speedups
Conflicts:
lib/coderay/encoders/html.rb
Diffstat (limited to 'lib/coderay/encoders')
| -rw-r--r-- | lib/coderay/encoders/html.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb index 7e83eb8..a2c274f 100644 --- a/lib/coderay/encoders/html.rb +++ b/lib/coderay/encoders/html.rb @@ -280,7 +280,7 @@ module Encoders if options[:tab_width] == DEFAULT_OPTIONS[:tab_width] HTML_ESCAPE else - HTML_ESCAPE.merge("\t" => ' ' * options[:tab_width]) + HTML_ESCAPE.merge("\t" => options[:tab_width] ? ' ' * options[:tab_width] : "\t") end Hash.new do |cache, text| |