summaryrefslogtreecommitdiff
path: root/lib/coderay.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-07-14 02:49:16 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-07-14 02:49:16 +0200
commitbf395bd14ed7f63aab84955f6768f59965e3a73e (patch)
tree870e3ee4980401f43c2dc9a34d2e8343ef3a20ca /lib/coderay.rb
parentffe0c90999c0b7255a5dfc608c84e683440475b1 (diff)
parent7493dcbfded42686169027a158c18c5312a3af24 (diff)
downloadcoderay-bf395bd14ed7f63aab84955f6768f59965e3a73e.tar.gz
Merge branch 'master' into cleanup-output
Diffstat (limited to 'lib/coderay.rb')
-rw-r--r--lib/coderay.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/coderay.rb b/lib/coderay.rb
index 24ae5a2..f759ed6 100644
--- a/lib/coderay.rb
+++ b/lib/coderay.rb
@@ -127,14 +127,14 @@ module CodeRay
$CODERAY_DEBUG ||= false
- CODERAY_PATH = File.join File.dirname(__FILE__), 'coderay'
+ CODERAY_PATH = File.expand_path('../coderay', __FILE__)
# Assuming the path is a subpath of lib/coderay/
def self.coderay_path *path
File.join CODERAY_PATH, *path
end
- require coderay_path('version')
+ require 'coderay/version'
# helpers
autoload :FileType, coderay_path('helpers', 'file_type')