diff --git a/ChangeLog b/ChangeLog
index 2915c1ee7e..b3fd3f5367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jul 18 13:04:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_missing): VCALL is called only for LOCAL_ID.  no
+	  check required.
+
+	* parse.y (primary): pritmary:tFID generates NODE_FCALL.
+	  [ruby-dev:20641]
+
 Thu Jul 17 18:50:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (match_captures): rename from "groups".
diff --git a/MANIFEST b/MANIFEST
index c6e9635813..170951393b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -300,9 +300,9 @@ lib/rexml/encodings/EUC-JP.rb
 lib/rexml/encodings/EUC-JP_decl.rb
 lib/rexml/encodings/ISO-8859-1.rb
 lib/rexml/encodings/ISO-8859-1_decl.rb
-lib/rexml/encodings/Shift-JIS.rb
+lib/rexml/encodings/SHIFT-JIS.rb
+lib/rexml/encodings/SHIFT_JIS.rb
 lib/rexml/encodings/Shift-JIS_decl.rb
-lib/rexml/encodings/Shift_JIS.rb
 lib/rexml/encodings/UNILE.rb
 lib/rexml/encodings/UNILE_decl.rb
 lib/rexml/encodings/US-ASCII.rb
diff --git a/eval.c b/eval.c
index 7068bb20a2..f520bfa7f3 100644
--- a/eval.c
+++ b/eval.c
@@ -4678,12 +4678,8 @@ rb_f_missing(argc, argv, obj)
 	format = "protected method `%s' called for %s%s%s";
     }
     else if (last_call_status & CSTAT_VCALL) {
-	const char *mname = rb_id2name(id);
-
-	if (('a' <= mname[0] && mname[0] <= 'z') || mname[0] == '_') {
-	    format = "undefined local variable or method `%s' for %s%s%s";
-	    exc = rb_eNameError;
-	}
+	format = "undefined local variable or method `%s' for %s%s%s";
+	exc = rb_eNameError;
     }
     else if (last_call_status & CSTAT_SUPER) {
 	format = "super: no superclass method `%s'";
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 50d72f8a2e..7013b004b2 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1,4 +1,4 @@
-# optparse library, not octopus.
+`# optparse library, not octopus.
 
 =begin
 = Summary
diff --git a/parse.y b/parse.y
index 44ca6544d3..fd107555d7 100644
--- a/parse.y
+++ b/parse.y
@@ -1406,7 +1406,7 @@ primary		: literal
 		| backref
 		| tFID
 		    {
-			$$ = NEW_VCALL($1);
+			$$ = NEW_FCALL($1, 0);
 		    }
 		| kBEGIN
 		    {