From 2df7054c3035b7c75d5a5e029f7928bd39374592 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Apr 2010 05:24:33 +0000
Subject: * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables  
 are delimited by a semicolon.  supported Vim style.  reapplied   r24988 with
 fixing a typo for shebang.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/rdoc.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/rdoc')

diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index 230639fb0c..10daefd5b9 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -387,7 +387,7 @@ The internal error was:
               end
 
     if defined? Encoding then
-      if /coding:\s*([\w-]+)/i =~ content[/\A(?:.*\n){0,2}/]
+      if /coding[=:]\s*([^\s;]+)/i =~ content[%r"\A(?:#!.*\n)?.*\n"]
         if enc = ::Encoding.find($1)
           content.force_encoding(enc)
         end
-- 
cgit v1.2.3