merge revision(s) 17497:

	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
	  magic comment.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d55265de9..9228a5390f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 17:23:51 2008  Nobuyoshi Nakada  <[email protected]>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
+	  magic comment.
+
 Sun Jun 29 17:21:08 2008  Nobuyoshi Nakada  <[email protected]>
 
 	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 58ba06084e..750c483c15 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1546,10 +1546,15 @@ module RDoc
 
       tk = get_tk
       while tk.kind_of?(TkCOMMENT)
-        if first_line && tk.text[0,2] == "#!"
+        if first_line && /\A#!/ =~ tk.text
+          skip_tkspace
+          tk = get_tk
+        elsif first_line && /\A#\s*-\*-/ =~ tk.text
+          first_line = false
           skip_tkspace
           tk = get_tk
         else
+          first_line = false
           res << tk.text << "\n"
           tk = get_tk
           if tk.kind_of? TkNL
@@ -1557,7 +1562,6 @@ module RDoc
             tk = get_tk
           end
         end
-        first_line = false
       end
       unget_tk(tk)
       res
diff --git a/version.h b/version.h
index 3bfe8012c0..ccc2b276b5 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 244
+#define RUBY_PATCHLEVEL 245
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8