3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d6f95919b..07e5adcf1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,11 @@ Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
 	* version.h: addition of RUBY_PATCHLEVEL.
 	* version.c: ditto.
 
+Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (primary): should set NODE even when compstmt is NULL.
+	  merge from trunk. fixed: [ruby-dev:29732]
+
 Sat Sep 23 21:34:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
diff --git a/parse.y b/parse.y
index e2982f2c80..7b05c18f46 100644
--- a/parse.y
+++ b/parse.y
@@ -1481,7 +1481,8 @@ primary		: literal
 		    }
 		| tLPAREN compstmt ')'
 		    {
-			$$ = $2;
+			if (!$2) $$ = NEW_NIL();
+			else $$ = $2;
 		    }
 		| primary_value tCOLON2 tCONSTANT
 		    {
diff --git a/version.h b/version.h
index e76c7f4bf3..eb9ef531ae 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2006-12-06"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20061206
-#define RUBY_PATCHLEVEL 4
+#define RUBY_PATCHLEVEL 5
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8