nobu	2010-04-02 14:24:33 +0900 (Fri, 02 Apr 2010)

  New Revision: 27183

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27183

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/rdoc.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27182)
+++ ChangeLog	(revision 27183)
@@ -1,3 +1,9 @@
+Fri Apr  2 14:24:27 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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.
+
 Fri Apr  2 14:16:54 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc
Index: lib/rdoc/rdoc.rb
===================================================================
--- lib/rdoc/rdoc.rb	(revision 27182)
+++ lib/rdoc/rdoc.rb	(revision 27183)
@@ -387,7 +387,7 @@
               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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/